fog-ovirt 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8782e80f74881843f3d5cfdf3537289c1f828190f9285905989d75f486252d13
-  data.tar.gz: b9088bc35338d04d9b6408ad91ff11db4623a998ca84346e2bce9c726b449e28
+  metadata.gz: 62f57ba56922d0b42dcb1630ca68d8eeaddadb546af155531f067cb69a827f6c
+  data.tar.gz: 8cd2223ae09ba6b051766f3c2adf16f16108aa62054809a2a67bc8d9a701b1f0
 SHA512:
-  metadata.gz: b25cf3dc201edb0a1b53fadab1d10182d3a7de3ecd26fed18c1e3c19ccad9d2855465f6e8e4f551aa4fcb685058db544e9baf730a90934bb7968e2dda3b770ca
-  data.tar.gz: e2423a8441309249034df7311e1884265fc5a1c747e3d3f20cb3a182747b8626d3137dd73b23bf02c589af499377a05f318fe8616a242db9f5a31a9f30a5a0a7
+  metadata.gz: 01da7011f032c165a82bd81fee927aa1692c5e5f47f6d3a4ff9520d6e2dce4eb05c5b63ce03fe31104da8cf50ab9f1c6416411daf74421e454b5dd4906271e74
+  data.tar.gz: 627e9e59398bd1a035d9e9d93fee254830dd57308d41652a2ad61a6f8c4027e9a0950a3ccd0eef14314e4384a3e6e1bea26720b2aadf13a89cb504eb72075b6a

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

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
@@ -111,20 +112,22 @@ module Fog
           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) }
+          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
 

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/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/create_vm.rb

@@ -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?

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/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/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ovirt
-    VERSION = "1.2.1".freeze
+    VERSION = "1.2.2".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/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.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ori Rabin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-11-10 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
@@ -311,6 +315,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
@@ -364,6 +370,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