fog-ovirt 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f57ba56922d0b42dcb1630ca68d8eeaddadb546af155531f067cb69a827f6c
-  data.tar.gz: 8cd2223ae09ba6b051766f3c2adf16f16108aa62054809a2a67bc8d9a701b1f0
+  metadata.gz: 9035effc2ab1bfc2040120139b903ab93f9c981dc0f5ce34540d8ab1dbe3d5f3
+  data.tar.gz: 2fd5d0441dba96b14a7ce3bf673531c602094f05ecc1e6f42d1a63f7474398f3
 SHA512:
-  metadata.gz: 01da7011f032c165a82bd81fee927aa1692c5e5f47f6d3a4ff9520d6e2dce4eb05c5b63ce03fe31104da8cf50ab9f1c6416411daf74421e454b5dd4906271e74
-  data.tar.gz: 627e9e59398bd1a035d9e9d93fee254830dd57308d41652a2ad61a6f8c4027e9a0950a3ccd0eef14314e4384a3e6e1bea26720b2aadf13a89cb504eb72075b6a
+  metadata.gz: a06c551b333e792e26b0634d7b9613536c070451d13590435cf03c1b471f7cabdbef0cb97afc72a377cded5f08974ddde79ab99d3558f1b5c0d78d0a6394d2b7
+  data.tar.gz: 12dad14839f2e98b11211cbf9115cd822fd2c82be4abd39b9413c9dc42a1b412f73ad8e5de7191dc26ffea6cc750b69e88f452bf885962d6bf49863779d616b3

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

@@ -44,7 +44,7 @@ module Fog
         module Shared
           # rubocop:disable Metrics/AbcSize, 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|
@@ -52,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
 
@@ -70,6 +70,7 @@ module Fog
             end
             opts
           end
+
           # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
           # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
@@ -138,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
@@ -177,17 +185,23 @@ module Fog
           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
             api.product_info.version.full_version
           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/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/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/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ovirt
-    VERSION = "1.2.2".freeze
+    VERSION = "1.2.3".freeze
   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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-ovirt
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Ori Rabin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-10 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -298,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