fog-ovirt 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0018dbcebca7b9c47941e86933df6d71f9106c80348689ab8ff3e355c5bb550a'
-  data.tar.gz: 312123f1ff82516363de62ed8cc2617117f3a8a9bd11cb655244332bbcf3b6dc
+  metadata.gz: 4cbc3f253a473c063a6f22507ecab2acb156f3be60d256184c7b2d024f4345f7
+  data.tar.gz: e7bccecc60f21d95f398fb99c8818c92c118d448b5d35da5ffb626eb7b67c14b
 SHA512:
-  metadata.gz: b3218482b5f4b274c684c906688e59112ea1a67d78a437c89502840ab8a6edecdf5e311072cf8470f88c8752f31527e53e479924290b6f0323a73f3579d7ff27
-  data.tar.gz: e5aa103e4a011613b64a86d2150a4a936d13e0f331bb287c404a912bcce618431d32ecb8d6ddb3c57b2b8c456840d89dd83fba1735663552eecbb27ed49cf77f
+  metadata.gz: 994e7f0826dde7c4fff25941e25065b098e3877493d5457a92edee03b7c951c993c4e4237a567b8e3c7c9091ededb0246c1b93ef363964b64e82dcf7ae22beb2
+  data.tar.gz: 0a8f71fd767765a45aff2524f2a4ea5467b84e6e66b7e7d8bf7efafa7a26ef87e05b9387d32823456efff68defba06203db36f58419705e23eb9581cc291566d

data/.gitignore

@@ -19,6 +19,7 @@ doc/*
 docs/_site/*
 docs/about/supported_services.markdown
 Gemfile.lock
+Gemfile.local.rb
 gemfiles/*.lock
 yardoc
 pkg

data/fog-ovirt.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency("fog-json")
   spec.add_dependency("fog-xml")
   spec.add_dependency("ovirt-engine-sdk", ">= 4.3.1")
-  spec.add_dependency("rbovirt", "~> 0.1.5")
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "pry"

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

@@ -43,6 +43,7 @@ module Fog
         request :list_quotas
         request :get_quota
         request :list_operating_systems
+        request :list_vnic_profiles
 
         module Shared
           # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

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

@@ -9,6 +9,7 @@ module Fog
         attribute :network
         attribute :interface
         attribute :mac
+        attribute :vnic_profile
 
         def to_s
           name

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

@@ -9,19 +9,15 @@ module Fog
             nics_service = vm.nics_service
             options = options.dup
             options = convert_string_to_bool(options)
-            if options[:network].present?
+            if options[:network].present? && options[:vnic_profile].nil?
               network = client.system_service.networks_service.network_service(options[:network]).get
-
               profiles = client.follow_link(network.vnic_profiles)
-
               profile = profiles.detect { |x| x.name == network.name }
-
               profile ||= profiles.min_by(&:name)
-
-              options.delete(:network)
-              options[:vnic_profile] = { :id => profile.id }
+              options[:vnic_profile] = profile.id
             end
-
+            options[:vnic_profile] = { :id => options[:vnic_profile] }
+            options.delete(:network)
             interface = OvirtSDK4::Nic.new(options)
             nics_service.add(interface)
           end

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

@@ -0,0 +1,25 @@
+module Fog
+  module Ovirt
+    class Compute
+      class V4
+        class Real
+          def list_vnic_profiles(_opts = {})
+            dc_vnics = []
+            profiles = client.system_service.vnic_profiles_service.list
+            profiles.each do |profile|
+              vnic_network = client.follow_link(profile.network)
+              dc_vnics.append(profile) if vnic_network.data_center.id == datacenter
+            end
+            dc_vnics
+          end
+        end
+        class Mock
+          def list_vnic_profiles(_filters = {})
+            xml = read_xml "vnic_profiles.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/vnic_profiles.xml

@@ -0,0 +1,42 @@
+<vnic_profiles>
+  <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/b295bf02-24b8-11ea-926f-001a4a160344" id="b295bf02-24b8-11ea-926f-001a4a160344"/>
+  </vnic_profile>
+  <vnic_profile href="/ovirt-engine/api/vnicprofiles/4e7431d7-bb74-4358-b065-7dc4a0a3f9a9" id="4e7431d7-bb74-4358-b065-7dc4a0a3f9a9">
+    <name>ovirtmgmt</name>
+    <link href="/ovirt-engine/api/vnicprofiles/4e7431d7-bb74-4358-b065-7dc4a0a3f9a9/permissions" rel="permissions"/>
+    <pass_through>
+      <mode>disabled</mode>
+    </pass_through>
+    <port_mirroring>false</port_mirroring>
+    <network href="/ovirt-engine/api/networks/f89cd192-657a-49aa-99ae-f325882eb70c" id="f89cd192-657a-49aa-99ae-f325882eb70c"/>
+    <network_filter href="/ovirt-engine/api/networkfilters/b295bf02-24b8-11ea-926f-001a4a160344" id="b295bf02-24b8-11ea-926f-001a4a160344"/>
+  </vnic_profile>
+  <vnic_profile href="/ovirt-engine/api/vnicprofiles/51249f24-17d3-48e8-807e-689d85a22b14" id="51249f24-17d3-48e8-807e-689d85a22b14">
+    <name>test</name>
+    <link href="/ovirt-engine/api/vnicprofiles/51249f24-17d3-48e8-807e-689d85a22b14/permissions" rel="permissions"/>
+    <pass_through>
+      <mode>disabled</mode>
+    </pass_through>
+    <port_mirroring>true</port_mirroring>
+    <network href="/ovirt-engine/api/networks/f89cd192-657a-49aa-99ae-f325882eb70c" id="f89cd192-657a-49aa-99ae-f325882eb70c"/>
+    <network_filter href="/ovirt-engine/api/networkfilters/b295bf02-24b8-11ea-926f-001a4a160344" id="b295bf02-24b8-11ea-926f-001a4a160344"/>
+  </vnic_profile>
+  <vnic_profile href="/ovirt-engine/api/vnicprofiles/8267104a-7597-474b-a617-9c787c1a8e9d" id="8267104a-7597-474b-a617-9c787c1a8e9d">
+    <name>fff</name>
+    <link href="/ovirt-engine/api/vnicprofiles/8267104a-7597-474b-a617-9c787c1a8e9d/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/b295bf02-24b8-11ea-926f-001a4a160344" id="b295bf02-24b8-11ea-926f-001a4a160344"/>
+  </vnic_profile>
+</vnic_profiles>

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

@@ -9,7 +9,7 @@ module Fog
             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
+              role_filter.nil? || Array(role_filter).include?(sd.type) ? sd : nil
             end.compact
           end
         end

data/lib/fog/ovirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ovirt
-    VERSION = "2.0.0".freeze
+    VERSION = "2.0.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-ovirt
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Ori Rabin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-13 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.3.1
-- !ruby/object:Gem::Dependency
-  name: rbovirt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +164,6 @@ files:
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
-- Gemfile.local.rb
 - LICENSE.md
 - README.md
 - Rakefile
@@ -230,6 +215,7 @@ files:
 - lib/fog/ovirt/requests/compute/v4/list_virtual_machines.rb
 - lib/fog/ovirt/requests/compute/v4/list_vm_interfaces.rb
 - lib/fog/ovirt/requests/compute/v4/list_vm_volumes.rb
+- lib/fog/ovirt/requests/compute/v4/list_vnic_profiles.rb
 - lib/fog/ovirt/requests/compute/v4/list_volumes.rb
 - lib/fog/ovirt/requests/compute/v4/mock_files/affinitygroup.xml
 - lib/fog/ovirt/requests/compute/v4/mock_files/affinitygroup_vms.xml
@@ -250,6 +236,7 @@ files:
 - 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/vnic_profiles.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