fog-ovirt 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b94675a38a2f78d4700f9c3a58ff1ee8a4c3e6a
-  data.tar.gz: 6869fa8820faaffbcbd1c512de48ff507c8dd206
+  metadata.gz: 0db74060b4baf3e164228414dea50eee4b190456
+  data.tar.gz: 37ac7fce1061b02648cf17b1650f8266ab264a0f
 SHA512:
-  metadata.gz: 3a5ee7eeb4f70938d3d9e7573bb73a9508d437bd212fb35cbc79e0a67e1c1d754ff0e6ee3beec06c51c1a12576374683a0797b56f65a0d241634217266ad393f
-  data.tar.gz: 44655837e13b3fffb191eddee238f160d6809ed95cba4e8205561a423610349a4e5aa1fa249b7ca40f62808f09caf079897821273975464925548290e0a9eccc
+  metadata.gz: cc1bdbba0adf313e68d6e2278cb8d0bbe642f6ec5b708c7ed649e028c3202867394696418a36cee09958207d24c603765e91d40ab70cb1aac40c8bc2f659acf6
+  data.tar.gz: 9aa2938661ac3506c0f84e85de7fe1c1ca9914d5598dc85e7d2b32e3e1f6b2854a74e1313a400abf4f262a1dcb87bb1d9fff678acad3cf71f7bcfced78fdefb2

data/.rubocop_todo.yml

@@ -14,7 +14,7 @@ Metrics/ClassLength:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 25
+  Max: 30
 
 # Offense count: 1
 Style/ClassVars:

data/README.md

@@ -38,6 +38,47 @@ compute = Fog::Compute.new(
       )
 ```
 
+## API Support
+
+This gem fully supports API v3 of oVirt.
+
+Version 1.0.2 adds support API V4 as well.
+The first version does not give full support.
+The supported requests for API V4 are:
+
+    :vm_action, :destroy_vm, :create_vm
+    :datacenters
+    :storage_domains
+    :list_virtual_machines, :get_virtual_machine
+    :list_templates, :get_template
+    :list_instance_types, :get_instance_type
+    :list_clusters, :get_cluster
+    :add_interface, :destroy_interface, :update_interface, :list_vm_interfaces, :list_template_interfaces
+    :list_networks
+    :vm_ticket
+    :list_vm_volumes, :list_template_volumes, :list_volumes, :add_volume, :destroy_volume, :update_volume
+    :get_api_version
+    :list_quotas, :get_quota
+    :list_operating_systems
+    
+### Choosing api version
+
+This example shows the usage as a fog provider:
+
+    client = Fog::Compute.new(
+        :provider         => "ovirt",
+        :ovirt_username   => user,
+        :ovirt_password   => password,
+        :ovirt_url        => url,
+        :ovirt_datacenter => datacenter,
+        :public_key       => public_key,
+        :api_version      => 'v4'
+      )    
+The :api_version can be sent 'v3' or 'v4' to determine which API version to use. 
+
+
+Feedback is welcome. Please feel free to open issues for the V4 support and contribute.
+
 ## Contributing
 
 Please refer to [CONTRIBUTING.md](CONTRIBUTING.md).

data/lib/fog/ovirt/compute/v4.rb

@@ -8,8 +8,10 @@ module Fog
         request_path "fog/ovirt/requests/compute/v4"
 
         request :vm_action
+        request :vm_start_with_cloudinit
         request :destroy_vm
         request :create_vm
+        request :update_vm
         request :datacenters
         request :storage_domains
         request :list_virtual_machines
@@ -71,11 +73,17 @@ module Fog
           end
           # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
           def get_attr_value(value, opts)
             case value
-            when OvirtSDK4::TemplateVersion, Array, Hash, OvirtSDK4::List, OvirtSDK4::DataCenter
+            when OvirtSDK4::List
+              value.to_a
+            when Array, Hash, DateTime
               value
+            when OvirtSDK4::HighAvailability
+              opts[:ha] = value.enabled
+            when OvirtSDK4::TemplateVersion
+              OpenStruct.new(:version_name => value.version_name, :version_number => value.version_number)
             when OvirtSDK4::Mac
               value.address
             when OvirtSDK4::Cpu
@@ -92,10 +100,14 @@ module Fog
                 :monitors => value.monitors
               }
             else
-              value.to_s.strip
+              if value.class.respond_to?(:parent) && value.class.parent == OvirtSDK4
+                value.id if value.respond_to?(:id)
+              else
+                value.to_s.strip
+              end
             end
           end
-          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         end
 
         class Mock
@@ -151,7 +163,15 @@ module Fog
           end
 
           def datacenter
-            @datacenter ||= datacenters.first[:id]
+            @datacenter ||= datacenter_hash[:id]
+          end
+
+          def datacenter_hash
+            @datacenter_hash ||= datacenters.first
+          end
+
+          def blank_template
+            @blank_template ||= client.system_service.get.special_objects.blank_template
           end
 
           private

data/lib/fog/ovirt/compute.rb

@@ -31,8 +31,9 @@ module Fog
           @client = client
         end
 
-        # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
         def method_missing(symbol, *args)
+          super unless @client.respond_to?(symbol)
+
           if block_given?
             @client.__send__(symbol, *args) do |*block_args|
               yield(*block_args)
@@ -44,10 +45,9 @@ module Fog
           raise ::Fog::Ovirt::Errors::OvirtEngineError, e
         end
 
-        def respond_to?(symbol, include_all = false)
-          @client.respond_to?(symbol, include_all)
+        def respond_to_missing?(method_name, include_private = false)
+          @client.respond_to?(symbol, include_all) || super
         end
-        # rubocop:enable Style/MethodMissingSuper, Style/MissingRespondToMissing
       end
 
       require "fog/ovirt/compute/v3"

data/lib/fog/ovirt/requests/compute/v4/create_vm.rb

@@ -27,9 +27,21 @@ module Fog
           # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           def create_vm(attrs)
             attrs = attrs.dup
-            attrs[:cluster_name] ||= datacenter.clusters.first.name unless attrs[:cluster]
+
+            if attrs[:cluster].present?
+              attrs[:cluster] = client.system_service.clusters_service.cluster_service(attrs[:cluster]).get
+            else
+              if attrs[:cluster_name].present?
+                cluster = client.system_service.clusters_service.list(:search => "name=#{attrs[:cluster_name]}").first
+              else
+                cluster = client.system_service.clusters_service.list(:search => "datacenter=#{datacenter_hash[:name]}").first
+                attrs[:cluster_name] = cluster.name
+              end
+
+              attrs[:cluster] = cluster
+            end
+
             vms_service = client.system_service.vms_service
-            attrs[:cluster] = client.system_service.clusters_service.cluster_service(attrs[:cluster]).get
             attrs[:instance_type] = attrs[:instance_type].present? ? client.system_service.instance_types_service.instance_type_service(attrs[:instance_type]).get : nil
 
             attrs[:template] = if attrs[:template].present?
@@ -45,9 +57,7 @@ module Fog
               attrs[:cpu] = OvirtSDK4::Cpu.new(:topology => cpu_topology)
             end
 
-            if attrs[:memory].to_i < Fog::Compute::Ovirt::DISK_SIZE_TO_GB
-              attrs[:memory_policy] = OvirtSDK4::MemoryPolicy.new(:guaranteed => attrs[:memory])
-            end
+            attrs[:memory_policy] = OvirtSDK4::MemoryPolicy.new(:guaranteed => attrs[:memory]) if attrs[:memory].to_i < Fog::Compute::Ovirt::DISK_SIZE_TO_GB
 
             # TODO: handle cloning from template
             process_vm_opts(attrs)

data/lib/fog/ovirt/requests/compute/v4/update_vm.rb

@@ -0,0 +1,56 @@
+module Fog
+  module Compute
+    class Ovirt
+      class V4
+        class Real
+          # rubocop:disable Metrics/AbcSize
+          def update_vm(attrs)
+            attrs = attrs.dup
+            vm_service = client.system_service.vms_service.vm_service(attrs[:id])
+
+            if attrs[:cores].present?
+              cpu_topology = OvirtSDK4::CpuTopology.new(:cores => attrs[:cores], :sockets => "1")
+              attrs[:cpu] = OvirtSDK4::Cpu.new(:topology => cpu_topology)
+            end
+            wrap_attribute(attrs, :cluster, OvirtSDK4::Cluster)
+            attrs[:template] = if attrs[:template].present?
+                                 OvirtSDK4::Template.new(:id => attrs[:template])
+                               else
+                                 blank_template
+                               end
+
+            wrap_attribute(attrs, :large_icon, OvirtSDK4::Icon)
+            wrap_attribute(attrs, :small_icon, OvirtSDK4::Icon)
+            wrap_attribute(attrs, :cpu_profile, OvirtSDK4::CpuProfile)
+            wrap_attribute(attrs, :host, OvirtSDK4::Host)
+            wrap_attribute(attrs, :quota, OvirtSDK4::Quota)
+            wrap_attribute(attrs, :instance_type, OvirtSDK4::InstanceType)
+            attrs[:high_availability] = OvirtSDK4::HighAvailability.new(:enabled => attrs[:ha]) unless attrs[:ha].nil?
+            attrs[:original_template] = if attrs[:original_template].present?
+                                          OvirtSDK4::Template.new(:id => attrs[:original_template])
+                                        else
+                                          blank_template
+                                        end
+            vm_service.update(attrs)
+          end
+          # rubocop:enable Metrics/AbcSize
+
+          def wrap_attribute(attrs, attribute, klass)
+            if attrs[attribute].present?
+              attrs[attribute] = klass.new(:id => attrs[attribute])
+            else
+              attrs.delete(attribute)
+            end
+          end
+        end
+
+        class Mock
+          def update_vm(_attrs)
+            xml = read_xml("vm.xml")
+            OvirtSDK4::Reader.read(Nokogiri::XML(xml).root.to_s)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/ovirt/requests/compute/v4/vm_start_with_cloudinit.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Compute
+    class Ovirt
+      class V4
+        class Real
+          def vm_start_with_cloudinit(options = {})
+            raise ArgumentError, "instance id is a required parameter" unless options.key? :id
+
+            vm_service = client.system_service.vms_service.vm_service(options[:id])
+            vm_service.start(:use_cloud_init => true, :vm => { :initialization => options[:user_data] })
+          end
+        end
+
+        class Mock
+          def vm_start_with_cloudinit(options = {})
+            raise ArgumentError, "instance id is a required parameter" unless options.key? :id
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/ovirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ovirt
-    VERSION = "1.1.0".freeze
+    VERSION = "1.1.1".freeze
   end
 end

data/lib/fog/ovirt.rb

@@ -3,7 +3,7 @@ require "fog/xml"
 
 module Fog
   module Compute
-    autoload :Ovirt, File.expand_path('../ovirt/compute', __FILE__)
+    autoload :Ovirt, File.expand_path("ovirt/compute", __dir__)
   end
 
   module Ovirt

data/tests/ovirt/compute_tests.rb

@@ -17,7 +17,7 @@ Shindo.tests("Fog::Compute[:ovirt]", ["ovirt"]) do
     %w[ add_interface create_vm datacenters destroy_interface destroy_vm get_cluster get_template
         get_virtual_machine list_clusters list_networks list_template_interfaces list_templates
         list_virtual_machines list_vm_interfaces storage_domains update_interface update_vm vm_action
-        api_version update_volume].each do |collection|
+        vm_start_with_cloudinit api_version update_volume].each do |collection|
       test("it should respond to #{collection}") { compute.respond_to? collection }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-ovirt
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ori Rabin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -297,8 +297,10 @@ files:
 - lib/fog/ovirt/requests/compute/v4/mock_files/volumes.xml
 - lib/fog/ovirt/requests/compute/v4/storage_domains.rb
 - lib/fog/ovirt/requests/compute/v4/update_interface.rb
+- lib/fog/ovirt/requests/compute/v4/update_vm.rb
 - lib/fog/ovirt/requests/compute/v4/update_volume.rb
 - lib/fog/ovirt/requests/compute/v4/vm_action.rb
+- lib/fog/ovirt/requests/compute/v4/vm_start_with_cloudinit.rb
 - lib/fog/ovirt/requests/compute/v4/vm_ticket.rb
 - lib/fog/ovirt/version.rb
 - spec/fog/bin/ovirt_spec.rb
@@ -352,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Ovirt.