fog-ovirt 1.2.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f57ba56922d0b42dcb1630ca68d8eeaddadb546af155531f067cb69a827f6c
-  data.tar.gz: 8cd2223ae09ba6b051766f3c2adf16f16108aa62054809a2a67bc8d9a701b1f0
+  metadata.gz: 4cbc3f253a473c063a6f22507ecab2acb156f3be60d256184c7b2d024f4345f7
+  data.tar.gz: e7bccecc60f21d95f398fb99c8818c92c118d448b5d35da5ffb626eb7b67c14b
 SHA512:
-  metadata.gz: 01da7011f032c165a82bd81fee927aa1692c5e5f47f6d3a4ff9520d6e2dce4eb05c5b63ce03fe31104da8cf50ab9f1c6416411daf74421e454b5dd4906271e74
-  data.tar.gz: 627e9e59398bd1a035d9e9d93fee254830dd57308d41652a2ad61a6f8c4027e9a0950a3ccd0eef14314e4384a3e6e1bea26720b2aadf13a89cb504eb72075b6a
+  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/.rubocop.yml

@@ -21,3 +21,13 @@ Style/SignalException:
 
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+AllCops:
+  Exclude:
+  - 'lib/fog/ovirt/compute.rb'

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-05-22 10:36:37 +0300 using RuboCop version 0.70.0.
+# on 2020-10-15 17:29:26 +0300 using RuboCop version 0.81.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,11 +11,18 @@
 Metrics/ClassLength:
   Max: 150
 
-# Offense count: 10
+# Offense count: 8
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 26
 
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'Gemfile.local.rb'
+
 # Offense count: 1
 Style/ClassVars:
   Exclude:
@@ -26,7 +33,7 @@ Style/CommentedKeyword:
   Exclude:
     - 'lib/fog/ovirt/models/compute/server.rb'
 
-# Offense count: 188
+# Offense count: 98
 Style/Documentation:
   Enabled: false
 
@@ -36,13 +43,18 @@ Style/DoubleNegation:
     - 'lib/fog/ovirt/models/compute/server.rb'
     - 'tests/helpers/succeeds_helper.rb'
 
-# Offense count: 133
+# Offense count: 84
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, never
+# SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+# Offense count: 3
+Style/MissingRespondToMissing:
+  Exclude:
+    - 'lib/fog/ovirt/compute.rb'
+
 # Offense count: 4
 Style/MultilineTernaryOperator:
   Exclude:

data/Gemfile

@@ -1,3 +1,2 @@
 source "https://rubygems.org"
-
 gemspec

data/README.md

@@ -40,9 +40,7 @@ compute = Fog::Compute.new(
 
 ## API Support
 
-This gem fully supports API v3 of oVirt.
-
-Version 1.0.2 adds support API V4 as well.
+This gem fully supports API V4 of oVirt.
 The first version does not give full support.
 The supported requests for API V4 are:
 
@@ -72,9 +70,7 @@ This example shows the usage as a fog provider:
         :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.
@@ -85,4 +81,4 @@ Please refer to [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## License
 
-Please refer to [LICENSE.md](LICENSE.md).
+Please refer to [LICENSE.md](LICENSE.md).

data/Rakefile

@@ -9,14 +9,8 @@ require "bundler/gem_tasks"
 
 mock = ENV["FOG_MOCK"] || "true"
 
-begin
-  require "rubocop/rake_task"
-  RuboCop::RakeTask.new do |t|
-    t.patterns = Dir["{lib,spec,tests}/**/*"]
-  end
-rescue StandardError
-  puts "Rubocop not loaded"
-end
+require "rubocop/rake_task"
+RuboCop::RakeTask.new
 
 task :test do
   sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/ovirt")

data/fog-ovirt.gemspec

@@ -17,14 +17,14 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^tests\/})
-
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.0.0"
 
+  spec.add_dependency("activesupport")
   spec.add_dependency("fog-core")
   spec.add_dependency("fog-json")
   spec.add_dependency("fog-xml")
-  spec.add_dependency("ovirt-engine-sdk", ">= 4.1.3")
-  spec.add_dependency("rbovirt", "~> 0.1.5")
+  spec.add_dependency("ovirt-engine-sdk", ">= 4.3.1")
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "pry"

data/lib/fog/ovirt/compute.rb

@@ -50,22 +50,13 @@ module Fog
         end
       end
 
-      require "fog/ovirt/compute/v3"
       require "fog/ovirt/compute/v4"
 
       def self.new(options = {})
         super(options)
-
-        # rubocop:disable Style/ConditionalAssignment
-        if options[:api_version] == "v4"
-          @client = Fog::Ovirt::Compute::V4.new(options)
-        else
-          @client = Fog::Ovirt::Compute::V3.new(options)
-        end
-        # rubocop:enable Style/ConditionalAssignment
+        @client = Fog::Ovirt::Compute::V4.new(options)
       end
 
-      # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
       def method_missing(symbol, *args)
         @client.__send__(symbol, *args)
       end
@@ -73,20 +64,13 @@ module Fog
       def respond_to?(symbol, include_all = false)
         @client.respond_to?(symbol, include_all)
       end
-      # rubocop:enable Style/MethodMissingSuper, Style/MissingRespondToMissing
 
       class Mock
         def initialize(options = {})
-          if options[:api_version] == "v4"
-            Fog::Ovirt::Compute::V4::Mock.include Fog::Ovirt::Compute::Collections
-            @client = Fog::Ovirt::Compute::V4::Mock.new(options)
-          else
-            Fog::Ovirt::Compute::V3::Mock.include Fog::Ovirt::Compute::Collections
-            @client = Fog::Ovirt::Compute::V3::Mock.new(options)
-          end
+          Fog::Ovirt::Compute::V4::Mock.include Fog::Ovirt::Compute::Collections
+          @client = Fog::Ovirt::Compute::V4::Mock.new(options)
         end
 
-        # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
         def method_missing(symbol, *args)
           @client.__send__(symbol, *args)
         end
@@ -94,21 +78,14 @@ module Fog
         def respond_to?(symbol, include_all = false)
           @client.respond_to?(symbol, include_all)
         end
-        # rubocop:enable Style/MethodMissingSuper, Style/MissingRespondToMissing
       end
 
       class Real
         def initialize(options = {})
-          if options[:api_version] == "v4"
-            Fog::Ovirt::Compute::V4::Real.include Fog::Ovirt::Compute::Collections
-            @client = Fog::Ovirt::Compute::V4::Real.new(options)
-          else
-            Fog::Ovirt::Compute::V3::Real.include Fog::Ovirt::Compute::Collections
-            @client = Fog::Ovirt::Compute::V3::Real.new(options)
-          end
+          Fog::Ovirt::Compute::V4::Real.include Fog::Ovirt::Compute::Collections
+          @client = Fog::Ovirt::Compute::V4::Real.new(options)
         end
 
-        # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
         def method_missing(symbol, *args)
           @client.send(symbol, *args)
         end
@@ -116,7 +93,6 @@ module Fog
         def respond_to?(symbol, include_all = false)
           @client.respond_to?(symbol, include_all)
         end
-        # rubocop:enable Style/MethodMissingSuper, Style/MissingRespondToMissing
       end
     end
   end

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

@@ -1,3 +1,6 @@
+require "active_support"
+require "active_support/core_ext"
+
 module Fog
   module Ovirt
     class Compute
@@ -40,11 +43,12 @@ module Fog
         request :list_quotas
         request :get_quota
         request :list_operating_systems
+        request :list_vnic_profiles
 
         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|
@@ -52,7 +56,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,9 +74,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
@@ -103,14 +108,14 @@ 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
+          # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
           def convert_string_to_bool(value)
             case value
@@ -138,6 +143,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
@@ -154,7 +166,6 @@ module Fog
         class Real
           include Shared
 
-          # rubocop:disable Metrics/AbcSize
           def initialize(options = {})
             require "ovirtsdk4"
             username   = options[:ovirt_username]
@@ -175,7 +186,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
@@ -183,11 +199,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/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/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/v4/add_interface.rb

@@ -3,30 +3,24 @@ 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)
             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
-          # rubocop:enable Metrics/AbcSize
         end
 
         class Mock