fog-ovirt 1.2.0 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c8f50700ff436d3f31a8c67a536c630cd6b8166dffd761f0ec3eaa751bad22
-  data.tar.gz: d3ab17d6c140811ec0843778869c416ea0323cf222efbd5c648128b63ccbe52e
+  metadata.gz: f7b24b23699c22d16d6f7a5da99f613ec7e7066022e5d6f0097fc15236745db8
+  data.tar.gz: e7f4357f8b657cd35625ebffe798cbc9bc09a65db3cb2aa6d5ec6f9706fad6c1
 SHA512:
-  metadata.gz: f6a869a3392da2cb17182a5b1d4dbbcaf286757bf55dbf7b0a00bec3ee79351c4d0cd137e1ad1c03001202b1a7e0ae56854b27f65ba78ee81b0e9555291d2998
-  data.tar.gz: df66a186ce9979c987bbc62097b20dd0d1022d5f547549c42806b32441c7a5c3ca58d59e014a24b9e9b6094a3c882356d116cccd31a615504da130788aefdeb5
+  metadata.gz: 805c36e9f5631026c94921b4278f1a193e5e52287a270e83a13c7bc1dfcdcd04a9588d76eb572ae5e2c632aba578acad499fd74a6bc3ca1965ac72ce72c37f9c
+  data.tar.gz: 83ce48a44a9f6952b18e8314551529e44cb7caf5df055dfdfb2402a4e976966f1191970538f8c5215f67ecf917c195ef464f841f931e8b2707d6077bf704ab52

data/.rubocop.yml

@@ -21,3 +21,6 @@ Style/SignalException:
 
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false

data/Rakefile

@@ -12,7 +12,7 @@ mock = ENV["FOG_MOCK"] || "true"
 begin
   require "rubocop/rake_task"
   RuboCop::RakeTask.new do |t|
-    t.patterns = Dir["{lib,spec,tests}/**/*"]
+    t.patterns = Dir["{lib,spec,tests}/**/*.rb"]
   end
 rescue StandardError
   puts "Rubocop not loaded"

data/lib/fog/ovirt/compute.rb

@@ -78,10 +78,10 @@ module Fog
       class Mock
         def initialize(options = {})
           if options[:api_version] == "v4"
-            Fog::Ovirt::Compute::V4::Mock.send(:include, Fog::Ovirt::Compute::Collections)
+            Fog::Ovirt::Compute::V4::Mock.include Fog::Ovirt::Compute::Collections
             @client = Fog::Ovirt::Compute::V4::Mock.new(options)
           else
-            Fog::Ovirt::Compute::V3::Mock.send(:include, Fog::Ovirt::Compute::Collections)
+            Fog::Ovirt::Compute::V3::Mock.include Fog::Ovirt::Compute::Collections
             @client = Fog::Ovirt::Compute::V3::Mock.new(options)
           end
         end
@@ -100,10 +100,10 @@ module Fog
       class Real
         def initialize(options = {})
           if options[:api_version] == "v4"
-            Fog::Ovirt::Compute::V4::Real.send(:include, Fog::Ovirt::Compute::Collections)
+            Fog::Ovirt::Compute::V4::Real.include Fog::Ovirt::Compute::Collections
             @client = Fog::Ovirt::Compute::V4::Real.new(options)
           else
-            Fog::Ovirt::Compute::V3::Real.send(:include, Fog::Ovirt::Compute::Collections)
+            Fog::Ovirt::Compute::V3::Real.include Fog::Ovirt::Compute::Collections
             @client = Fog::Ovirt::Compute::V3::Real.new(options)
           end
         end

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

@@ -34,6 +34,7 @@ module Fog
         request :list_template_volumes
         request :list_volumes
         request :add_volume
+        request :get_volume
         request :destroy_volume
         request :update_volume
         request :attach_volume
@@ -102,7 +103,6 @@ module Fog
         class Real
           include Shared
 
-          # rubocop:disable Metrics/AbcSize
           def initialize(options = {})
             require "rbovirt"
             username   = options[:ovirt_username]
@@ -121,7 +121,6 @@ module Fog
 
             @client = ExceptionWrapper.new(OVIRT::Client.new(username, password, url, connection_opts))
           end
-          # rubocop:enable Metrics/AbcSize
 
           def api_version
             client.api_version

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

@@ -33,6 +33,7 @@ module Fog
         request :list_template_volumes
         request :list_volumes
         request :add_volume
+        request :get_volume
         request :destroy_volume
         request :update_volume
         request :get_api_version
@@ -41,9 +42,9 @@ module Fog
         request :list_operating_systems
 
         module Shared
-          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           # converts an OVIRT object into an hash for fog to consume.
-          def ovirt_attrs(obj)
+          def shared_ovirt_attrs(obj)
             opts = {}
             # TODO: stop using instance_variables, they will change
             obj.instance_variables.each do |v|
@@ -51,7 +52,7 @@ module Fog
               value = obj.instance_variable_get(v)
 
               if key == :network
-                opts[key] = obj.vnic_profile.present? ? client.follow_link(obj.vnic_profile).network.id : value
+                opts[key] = obj.vnic_profile.present? ? yield(obj) : value
                 next
               end
 
@@ -69,9 +70,10 @@ module Fog
             end
             opts
           end
-          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+          # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
           def get_attr_value(value, opts)
             case value
             when OvirtSDK4::List
@@ -102,29 +104,31 @@ module Fog
             when OvirtSDK4::Console
               { :enabled => value.enabled }
             else
-              if value.class.respond_to?(:parent) && value.class.parent == OvirtSDK4
+              if value.class.respond_to?(:module_parent) && value.class.module_parent == OvirtSDK4
                 value.id if value.respond_to?(:id)
               else
                 value.to_s.strip
               end
             end
           end
-          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-
-          def convert_string_to_bool(opts)
-            return opts unless opts.present?
-            opts.each do |key, value|
-              if value == "true"
-                opts[key] = true
-              elsif value == "false"
-                opts[key] = false
-              elsif value.is_a? Hash
-                convert_string_to_bool(value)
-              elsif value.is_a? Array
-                value.map { |item| convert_string_to_bool(item) }
+          # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+
+          def convert_string_to_bool(value)
+            case value
+            when "true"
+              true
+            when "false"
+              false
+            when Array
+              value.map { |elem| convert_string_to_bool(elem) }
+            when Hash
+              value.each do |key, elem|
+                value[key] = convert_string_to_bool(elem)
               end
+              value
+            else
+              value
             end
-            opts
           end
         end
 
@@ -135,6 +139,13 @@ module Fog
             require "ovirtsdk4"
           end
 
+          def ovirt_attrs(obj)
+            shared_ovirt_attrs(obj) do
+              xml = read_xml("vnic_profile.xml")
+              Nokogiri::XML(xml).xpath("/vnic_profile/network/@id").to_s
+            end
+          end
+
           private
 
           def client
@@ -151,7 +162,6 @@ module Fog
         class Real
           include Shared
 
-          # rubocop:disable Metrics/AbcSize
           def initialize(options = {})
             require "ovirtsdk4"
             username   = options[:ovirt_username]
@@ -172,7 +182,12 @@ module Fog
 
             @client = ExceptionWrapper.new(OvirtSDK4::Connection.new(connection_opts))
           end
-          # rubocop:enable Metrics/AbcSize
+
+          def ovirt_attrs(obj)
+            shared_ovirt_attrs(obj) do
+              client.follow_link(obj.vnic_profile).network.id
+            end
+          end
 
           def api_version
             api = client.system_service.get
@@ -180,11 +195,11 @@ module Fog
           end
 
           def datacenter
-            @datacenter ||= datacenter_hash[:id]
+            datacenter_hash[:id]
           end
 
           def datacenter_hash
-            @datacenter_hash ||= datacenters.find { |x| x[:id] == @datacenter } if @datacenter
+            @datacenter_hash ||= datacenters.find { |x| x[:id] == @datacenter } || datacenters.find { |x| x[:name] == @datacenter } if @datacenter
             @datacenter_hash ||= datacenters.first
           end
 

data/lib/fog/ovirt/models/compute/instance_type.rb

@@ -10,6 +10,7 @@ module Fog
         attribute :description
         attribute :memory
         attribute :cores
+        attribute :sockets
         attribute :creation_time
         attribute :os
         attribute :ha

data/lib/fog/ovirt/models/compute/interfaces.rb

@@ -9,7 +9,6 @@ module Fog
 
         attr_accessor :vm
 
-        # rubocop:disable Metrics/AbcSize
         def all(_filters = {})
           requires :vm
           if vm.is_a? Fog::Ovirt::Compute::Server
@@ -20,7 +19,6 @@ module Fog
             raise ::Fog::Ovirt::Errors::OvirtError, "interfaces should have vm or template"
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         def get(id)
           new service.get_interface(id)

data/lib/fog/ovirt/models/compute/server.rb

@@ -121,7 +121,6 @@ module Fog
           vm_power_action(:start)
         end
 
-        # rubocop:disable Metrics/AbcSize
         def start_with_cloudinit(options = {})
           wait_for { !locked? } if options[:blocking]
           user_data = if options[:use_custom_script]
@@ -133,7 +132,6 @@ module Fog
           reload
           action_status
         end
-        # rubocop:enable Metrics/AbcSize
 
         def stop(_options = {})
           vm_power_action(:stop)

data/lib/fog/ovirt/models/compute/volume.rb

@@ -17,6 +17,7 @@ module Fog
         attribute :quota
         attribute :alias
         attribute :wipe_after_delete
+        attribute :name
 
         def size_gb
           attributes[:size_gb] ||= attributes[:size].to_i / Fog::Ovirt::Compute::DISK_SIZE_TO_GB if attributes[:size]

data/lib/fog/ovirt/models/compute/volumes.rb

@@ -9,7 +9,6 @@ module Fog
 
         attr_accessor :vm
 
-        # rubocop:disable Metrics/AbcSize
         def all(_filters = {})
           if vm.is_a? Fog::Ovirt::Compute::Server
             load service.list_vm_volumes(vm.id)
@@ -19,7 +18,6 @@ module Fog
             load service.list_volumes
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         def get(id)
           new service.get_volume(id)

data/lib/fog/ovirt/requests/compute/v3/get_volume.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Ovirt
+    class Compute
+      class V3
+        class Real
+          def get_volume(id)
+            ovirt_attrs client.disk(id)
+          end
+        end
+        class Mock
+          def get_volume(_id)
+            xml = read_xml("volume.xml")
+            ovirt_attrs OVIRT::Volume.new(self, Nokogiri::XML(xml).root)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/ovirt/requests/compute/v3/mock_files/volume.xml

@@ -0,0 +1,21 @@
+<disks>
+  <disk href="/api/vms/192cdd3f-3281-4e20-b81d-93bdc57ac387/disks/9f68ecfd-218b-4f80-8e7a-e70b2ab054cd" id="9f68ecfd-218b-4f80-8e7a-e70b2ab054cd">
+    <name>Disk 2</name>
+    <link href="/api/vms/192cdd3f-3281-4e20-b81d-93bdc57ac387/disks/9f68ecfd-218b-4f80-8e7a-e70b2ab054cd/statistics" rel="statistics"/>
+    <vm href="/api/vms/192cdd3f-3281-4e20-b81d-93bdc57ac387" id="192cdd3f-3281-4e20-b81d-93bdc57ac387"/>
+    <storage_domains>
+      <storage_domain id="cba62b33-887a-410c-b367-e3d9229a72f7"/>
+    </storage_domains>
+    <size>5368709120</size>
+    <type>data</type>
+    <status>
+      <state>ok</state>
+    </status>
+    <interface>virtio</interface>
+    <format>raw</format>
+    <sparse>true</sparse>
+    <bootable>false</bootable>
+    <wipe_after_delete>false</wipe_after_delete>
+    <propagate_errors>false</propagate_errors>
+  </disk>
+</disks>

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

@@ -3,7 +3,6 @@ module Fog
     class Compute
       class V4
         class Real
-          # rubocop:disable Metrics/AbcSize
           def add_interface(id, options = {})
             raise ArgumentError, "instance id is a required parameter" unless id
             vm = client.system_service.vms_service.vm_service(id)
@@ -26,7 +25,6 @@ module Fog
             interface = OvirtSDK4::Nic.new(options)
             nics_service.add(interface)
           end
-          # rubocop:enable Metrics/AbcSize
         end
 
         class Mock

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

@@ -13,7 +13,7 @@ module Fog
             disk_attachments_service.add(disk)
           end
 
-          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           def add_options_defaults(options)
             options = options.dup
             options = convert_string_to_bool(options)
@@ -35,7 +35,7 @@ module Fog
             options[:disk][:wipe_after_delete] = options.delete(:wipe_after_delete) if options[:disk][:wipe_after_delete].nil?
             options
           end
-          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         end
 
         class Mock

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

@@ -21,7 +21,7 @@ module Fog
             opts.delete(:disks)
           end
 
-          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
+          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
           def create_vm(attrs)
             attrs = attrs.dup
             attrs = convert_string_to_bool(attrs)
@@ -40,6 +40,8 @@ module Fog
             end
 
             vms_service = client.system_service.vms_service
+
+            attrs[:type] = attrs.fetch(:type, OvirtSDK4::VmType::SERVER)
             attrs[:instance_type] = attrs[:instance_type].present? ? client.system_service.instance_types_service.instance_type_service(attrs[:instance_type]).get : nil
 
             if attrs[:template].present?
@@ -63,9 +65,8 @@ module Fog
             new_vm = OvirtSDK4::Vm.new(attrs)
             vms_service.add(new_vm, :clone => attrs[:clone])
           end
-          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
+          # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
 
-          # rubocop:disable Metrics/AbcSize
           def update_os_attrs(attrs)
             attrs[:os] ||= {}
             attrs[:os][:type] ||= "Other OS"
@@ -74,7 +75,6 @@ module Fog
 
             attrs[:os] = OvirtSDK4::OperatingSystem.new(:type => attrs[:os][:type], :boot => OvirtSDK4::Boot.new(:devices => attrs[:os][:boot]))
           end
-          # rubocop:enable Metrics/AbcSize
         end
 
         class Mock

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

@@ -0,0 +1,19 @@
+module Fog
+  module Ovirt
+    class Compute
+      class V4
+        class Real
+          def get_volume(id)
+            ovirt_attrs client.system_service.disks_service.disk_service(id).get
+          end
+        end
+        class Mock
+          def get_volume(_id)
+            xml = read_xml("disk.xml")
+            ovirt_attrs OvirtSDK4::Reader.read(Nokogiri::XML(xml).root.to_s)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,6 @@ module Fog
     class Compute
       class V4
         class Real
-          # rubocop:disable Metrics/AbcSize
           def list_template_volumes(template_id)
             template = client.system_service.templates_service.template_service(template_id).get
             attachments = client.follow_link(template.disk_attachments)
@@ -18,7 +17,6 @@ module Fog
               ovirt_attrs attachment_disk
             end
           end
-          # rubocop:enable Metrics/AbcSize
         end
         class Mock
           def list_template_volumes(_template_id)

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

@@ -3,7 +3,6 @@ module Fog
     class Compute
       class V4
         class Real
-          # rubocop:disable Metrics/AbcSize
           def list_vm_volumes(vm_id)
             vm = client.system_service.vms_service.vm_service(vm_id).get
             attachments = client.follow_link(vm.disk_attachments)
@@ -18,7 +17,6 @@ module Fog
               ovirt_attrs attachment_disk
             end
           end
-          # rubocop:enable Metrics/AbcSize
         end
         class Mock
           def list_vm_volumes(_vm_id)

data/lib/fog/ovirt/requests/compute/v4/mock_files/disk.xml

@@ -0,0 +1,28 @@
+<disks>
+  <disk href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05" id="4d1abf9a-da81-4de2-bf20-f5f060018e05">
+    <actions>
+      <link href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05/export" rel="export"/>
+      <link href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05/move" rel="move"/>
+      <link href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05/copy" rel="copy"/>
+    </actions>
+    <name>Disk 2</name>
+    <link href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05/permissions" rel="permissions"/>
+    <link href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05/statistics" rel="statistics"/>
+    <alias>Disk 2</alias>
+    <image_id>d6034a90-39fa-46ee-888f-208a76f3baa4</image_id>
+    <storage_domains>
+      <storage_domain id="a23a4329-33b9-4246-a393-4f91071825b6"/>
+    </storage_domains>
+    <provisioned_size>4294967296</provisioned_size>
+    <actual_size>1073741824</actual_size>
+    <status>ok</status>
+    <interface>virtio</interface>
+    <format>cow</format>
+    <qcow_version>qcow2_v3</qcow_version>
+    <sparse>true</sparse>
+    <bootable>false</bootable>
+    <shareable>false</shareable>
+    <wipe_after_delete>false</wipe_after_delete>
+    <propagate_errors>false</propagate_errors>
+  </disk>
+</disks>

data/lib/fog/ovirt/requests/compute/v4/mock_files/template.xml

@@ -1,45 +1,48 @@
-<templates>
-  <template href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323" id="2a08ba05-f3b1-4e5a-ade9-496466a8b323">
-    <name>hwp_small</name>
-    <description>hardware profile small</description>
-    <link href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323/disks" rel="disks"/>
-    <link href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323/nics" rel="nics"/>
-    <link href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323/cdroms" rel="cdroms"/>
-    <link href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323/permissions" rel="permissions"/>
-    <type>server</type>
-    <status>ok</status>
-    <memory>536870912</memory>
-    <cpu>
-      <topology>
-        <cores>1</cores>
-        <sockets>1</sockets>
-      </topology>
-    </cpu>
-    <os>
-      <type>unassigned</type>
-      <boot>
-        <devices>
-          <device>network</device>
-        </devices>
-      </boot>
-      <kernel/>
-      <initrd/>
-      <cmdline/>
-    </os>
-    <cluster href="/api/clusters/99408929-82cf-4dc7-a532-9d998063fa95" id="99408929-82cf-4dc7-a532-9d998063fa95"/>
-    <creation_time>2012-01-31T07:47:03.811Z</creation_time>
-    <origin>rhev</origin>
-    <high_availability>
-      <enabled>false</enabled>
-      <priority>1</priority>
-    </high_availability>
-    <display>
-      <type>spice</type>
-      <monitors>1</monitors>
-    </display>
-    <stateless>false</stateless>
-    <usb>
-      <enabled>true</enabled>
-    </usb>
-  </template>
-</templates>
+<template href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323" id="2a08ba05-f3b1-4e5a-ade9-496466a8b323">
+  <name>hwp_small</name>
+  <description>hardware profile small</description>
+  <link href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323/disks" rel="disks"/>
+  <link href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323/nics" rel="nics"/>
+  <link href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323/cdroms" rel="cdroms"/>
+  <link href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323/permissions" rel="permissions"/>
+  <type>server</type>
+  <memory>536870912</memory>
+  <cpu>
+    <topology>
+      <cores>1</cores>
+      <sockets>1</sockets>
+    </topology>
+  </cpu>
+  <os>
+    <type>unassigned</type>
+    <boot>
+      <devices>
+        <device>network</device>
+      </devices>
+    </boot>
+    <kernel/>
+    <initrd/>
+    <cmdline/>
+  </os>
+  <cluster href="/api/clusters/99408929-82cf-4dc7-a532-9d998063fa95" id="99408929-82cf-4dc7-a532-9d998063fa95"/>
+  <creation_time>2012-01-31T07:47:03.811Z</creation_time>
+  <origin>rhev</origin>
+  <high_availability>
+    <enabled>false</enabled>
+    <priority>1</priority>
+  </high_availability>
+  <display>
+    <type>spice</type>
+    <monitors>1</monitors>
+  </display>
+  <stateless>false</stateless>
+  <usb>
+    <enabled>true</enabled>
+  </usb>
+  <status>ok</status>
+  <version>
+    <version_name>base version</version_name>
+    <version_number>1</version_number>
+    <base_template href="/ovirt-engine/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323" id="2a08ba05-f3b1-4e5a-ade9-496466a8b323"/>
+  </version>
+</template>

data/lib/fog/ovirt/requests/compute/v4/mock_files/templates.xml

@@ -8,6 +8,11 @@
     <link href="/api/templates/00000000-0000-0000-0000-000000000000/permissions" rel="permissions"/>
     <type>desktop</type>
     <status>ok</status>
+    <version>
+      <version_name>base version</version_name>
+      <version_number>1</version_number>
+      <base_template href="/ovirt-engine/api/templates/00000000-0000-0000-0000-000000000000" id="00000000-0000-0000-0000-000000000000"/>
+    </version>
     <memory>536870912</memory>
     <cpu>
       <topology>
@@ -47,7 +52,6 @@
     <link href="/api/templates/05a5144f-8ef7-4151-b7f9-5014510b489e/cdroms" rel="cdroms"/>
     <link href="/api/templates/05a5144f-8ef7-4151-b7f9-5014510b489e/permissions" rel="permissions"/>
     <type>server</type>
-    <status>ok</status>
     <memory>1073741824</memory>
     <cpu>
       <topology>
@@ -81,6 +85,12 @@
     <usb>
       <enabled>true</enabled>
     </usb>
+    <status>ok</status>
+    <version>
+      <version_name>base version</version_name>
+      <version_number>1</version_number>
+      <base_template href="/ovirt-engine/api/templates/05a5144f-8ef7-4151-b7f9-5014510b489e" id="05a5144f-8ef7-4151-b7f9-5014510b489e"/>
+    </version>
   </template>
   <template href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323" id="2a08ba05-f3b1-4e5a-ade9-496466a8b323">
     <name>hwp_small</name>
@@ -90,7 +100,6 @@
     <link href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323/cdroms" rel="cdroms"/>
     <link href="/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323/permissions" rel="permissions"/>
     <type>server</type>
-    <status>ok</status>
     <memory>536870912</memory>
     <cpu>
       <topology>
@@ -124,5 +133,11 @@
     <usb>
       <enabled>true</enabled>
     </usb>
+    <status>ok</status>
+    <version>
+      <version_name>base version</version_name>
+      <version_number>1</version_number>
+      <base_template href="/ovirt-engine/api/templates/2a08ba05-f3b1-4e5a-ade9-496466a8b323" id="2a08ba05-f3b1-4e5a-ade9-496466a8b323"/>
+    </version>
   </template>
 </templates>

data/lib/fog/ovirt/requests/compute/v4/mock_files/vnic_profile.xml

@@ -0,0 +1,10 @@
+<vnic_profile href="/ovirt-engine/api/vnicprofiles/0000000a-000a-000a-000a-000000000398" id="0000000a-000a-000a-000a-000000000398">
+  <name>ovirtmgmt</name>
+  <link href="/ovirt-engine/api/vnicprofiles/0000000a-000a-000a-000a-000000000398/permissions" rel="permissions"/>
+  <pass_through>
+    <mode>disabled</mode>
+  </pass_through>
+  <port_mirroring>false</port_mirroring>
+  <network href="/ovirt-engine/api/networks/00000000-0000-0000-0000-000000000009" id="00000000-0000-0000-0000-000000000009"/>
+  <network_filter href="/ovirt-engine/api/networkfilters/593567f3-0314-011f-020e-0000000002d2" id="593567f3-0314-011f-020e-0000000002d2"/>
+</vnic_profile>

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

@@ -6,6 +6,7 @@ module Fog
           def storage_domains(filter = {})
             filter = filter.dup
             role_filter = filter.delete(:role)
+            filter[:search] = create_search_by_datacenter(:search => filter[:search], :datacenter => datacenter_hash[:name])
             client.system_service.storage_domains_service.list(filter).collect do |sd|
               # Filter by role is not supported by the search language. The work around is to list all, then filter.
               role_filter.nil? || sd.type == role_filter ? sd : nil

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

@@ -3,7 +3,6 @@ module Fog
     class Compute
       class V4
         class Real
-          # rubocop:disable Metrics/AbcSize
           def update_vm(attrs)
             attrs = attrs.dup
             attrs = convert_string_to_bool(attrs)
@@ -34,7 +33,6 @@ module Fog
                                         end
             vm_service.update(attrs)
           end
-          # rubocop:enable Metrics/AbcSize
 
           def wrap_attribute(attrs, attribute, klass)
             if attrs[attribute].present?

data/lib/fog/ovirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ovirt
-    VERSION = "1.2.0".freeze
+    VERSION = "1.2.5".freeze
   end
 end

data/tests/ovirt/models/compute/instance_type_tests.rb

@@ -0,0 +1,23 @@
+Shindo.tests("Fog::Ovirt::Compute.new | instance_type model", ["ovirt"]) do
+  instance_types = Fog::Ovirt::Compute.new.instance_types
+  instance_type = instance_types.last
+
+  tests("The instance_type model should") do
+    tests("have attributes") do
+      model_attribute_hash = instance_type.attributes
+      attributes = %i[id name memory sockets cores]
+
+      tests("The instance type model should respond to") do
+        attributes.each do |attribute|
+          test(attribute.to_s) { instance_type.respond_to? attribute }
+        end
+      end
+      tests("The attributes hash should have key") do
+        attributes.each do |attribute|
+          test(attribute.to_s) { model_attribute_hash.key? attribute }
+        end
+      end
+    end
+    test("be a kind of Fog::Ovirt::Compute::InstanceType") { instance_type.is_a? Fog::Ovirt::Compute::InstanceType }
+  end
+end

data/tests/ovirt/models/compute/instance_types_tests.rb

@@ -0,0 +1,7 @@
+Shindo.tests("Fog::Ovirt::Compute.new | instance types collection", ["ovirt"]) do
+  instance_types = Fog::Ovirt::Compute.new.instance_types
+
+  tests("The instance types collection") do
+    test("should be a kind of Fog::Ovirt::Compute::InstanceTypes") { instance_types.is_a? Fog::Ovirt::Compute::InstanceTypes }
+  end
+end

data/tests/ovirt/requests/compute/v4/client_tests.rb

@@ -2,7 +2,7 @@ Shindo.tests("Fog::Ovirt::Compute.new | client", ["ovirt"]) do
   before do
     @client_mock = Object.new
     def @client_mock.foo
-      raise OVIRT::OvirtException, "Test"
+      raise ::Fog::Ovirt::Errors::OvirtError, "Test"
     end
 
     @object_under_test = Fog::Ovirt::Compute::ExceptionWrapper.new(@client_mock)

data/tests/ovirt/requests/compute/v4/create_vm_tests.rb

@@ -5,6 +5,7 @@ Shindo.tests("Fog::Ovirt::Compute v4 | vm_create request", "ovirt") do
   tests("Create VM") do
     response = compute.create_vm(:name => "fog-" + name_base.to_s, :cluster_name => "Default")
     test("should be a kind of OvirtSDK4::Vm") { response.is_a? OvirtSDK4::Vm }
+    test("should be a 'OvirtSDK4::VmType::SERVER' VM type by default") { response.type == OvirtSDK4::VmType::SERVER }
   end
 
   tests("Create VM from template (clone)") do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-ovirt
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.5
 platform: ruby
 authors:
 - Ori Rabin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -212,6 +212,7 @@ files:
 - lib/fog/ovirt/requests/compute/v3/get_quota.rb
 - lib/fog/ovirt/requests/compute/v3/get_template.rb
 - lib/fog/ovirt/requests/compute/v3/get_virtual_machine.rb
+- lib/fog/ovirt/requests/compute/v3/get_volume.rb
 - lib/fog/ovirt/requests/compute/v3/list_affinity_group_vms.rb
 - lib/fog/ovirt/requests/compute/v3/list_affinity_groups.rb
 - lib/fog/ovirt/requests/compute/v3/list_clusters.rb
@@ -243,6 +244,7 @@ files:
 - lib/fog/ovirt/requests/compute/v3/mock_files/templates.xml
 - lib/fog/ovirt/requests/compute/v3/mock_files/vm.xml
 - lib/fog/ovirt/requests/compute/v3/mock_files/vms.xml
+- lib/fog/ovirt/requests/compute/v3/mock_files/volume.xml
 - lib/fog/ovirt/requests/compute/v3/mock_files/volumes.xml
 - lib/fog/ovirt/requests/compute/v3/remove_from_affinity_group.rb
 - lib/fog/ovirt/requests/compute/v3/storage_domains.rb
@@ -265,6 +267,7 @@ files:
 - lib/fog/ovirt/requests/compute/v4/get_quota.rb
 - lib/fog/ovirt/requests/compute/v4/get_template.rb
 - lib/fog/ovirt/requests/compute/v4/get_virtual_machine.rb
+- lib/fog/ovirt/requests/compute/v4/get_volume.rb
 - lib/fog/ovirt/requests/compute/v4/list_clusters.rb
 - lib/fog/ovirt/requests/compute/v4/list_instance_types.rb
 - lib/fog/ovirt/requests/compute/v4/list_networks.rb
@@ -283,6 +286,7 @@ files:
 - lib/fog/ovirt/requests/compute/v4/mock_files/cluster.xml
 - lib/fog/ovirt/requests/compute/v4/mock_files/clusters.xml
 - lib/fog/ovirt/requests/compute/v4/mock_files/data_centers.xml
+- lib/fog/ovirt/requests/compute/v4/mock_files/disk.xml
 - lib/fog/ovirt/requests/compute/v4/mock_files/disks.xml
 - lib/fog/ovirt/requests/compute/v4/mock_files/instance_type.xml
 - lib/fog/ovirt/requests/compute/v4/mock_files/instance_types.xml
@@ -294,6 +298,7 @@ files:
 - lib/fog/ovirt/requests/compute/v4/mock_files/templates.xml
 - lib/fog/ovirt/requests/compute/v4/mock_files/vm.xml
 - lib/fog/ovirt/requests/compute/v4/mock_files/vms.xml
+- lib/fog/ovirt/requests/compute/v4/mock_files/vnic_profile.xml
 - 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
@@ -311,6 +316,8 @@ files:
 - tests/ovirt/compute_tests.rb
 - tests/ovirt/models/compute/cluster_tests.rb
 - tests/ovirt/models/compute/clusters_tests.rb
+- tests/ovirt/models/compute/instance_type_tests.rb
+- tests/ovirt/models/compute/instance_types_tests.rb
 - tests/ovirt/models/compute/interface_tests.rb
 - tests/ovirt/models/compute/interfaces_tests.rb
 - tests/ovirt/models/compute/operating_system_tests.rb
@@ -353,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Ovirt.
@@ -364,6 +371,8 @@ test_files:
 - tests/ovirt/compute_tests.rb
 - tests/ovirt/models/compute/cluster_tests.rb
 - tests/ovirt/models/compute/clusters_tests.rb
+- tests/ovirt/models/compute/instance_type_tests.rb
+- tests/ovirt/models/compute/instance_types_tests.rb
 - tests/ovirt/models/compute/interface_tests.rb
 - tests/ovirt/models/compute/interfaces_tests.rb
 - tests/ovirt/models/compute/operating_system_tests.rb