fog-ovirt 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71684d4a4643676f4814809219a4058a4fac0e27
-  data.tar.gz: c955613117d9b60ce9146b603af5ee7414525986
+  metadata.gz: 6146d4fb921308e0f84cd983e1c0388cb81a8be5
+  data.tar.gz: 3b59c220c23dadfb77f63aaee4a6106ef169d064
 SHA512:
-  metadata.gz: c5e5490f49c148e247b3ef5da98c0dd20e8655932ab1a5c02262f27460590ac5762bd8349dff44f9771d5d36d1be314c30964699eb43caa7b5842ea36089bc56
-  data.tar.gz: 8878fcf57d1419ed852bb1f3a04cbe54107c646858b1683a1a5808e3974410ead1104329d064f5bf133aa213de2929f6a30b7f579b9e223b5bd37bcf8db9ecde
+  metadata.gz: 75bbc67488aac1503eae3ece69b447d8d09fdffa5af68bdb7ac9c5b5a4dba491e42ec1f8012c883b30964c5b50ac471adadcee280584786b7dcf44ebc2e72075
+  data.tar.gz: 38f7d09671007b163e23fd6ccf5e0d7dead675723ed1e24ada44193eb8e56427e7a68a919400544a5a9ef2e40e9cd8466baa5d36ad9979061684e1cca869494b

data/.rubocop.yml

@@ -0,0 +1,20 @@
+inherit_from: .rubocop_todo.yml
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Metrics/LineLength:
+  Max: 100
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/Encoding:
+  Description: 'Use UTF-8 as the source file encoding.'
+  Enabled: false
+
+Style/SignalException:
+  Description: 'Do not enforce use of fail when raising exceptions.'
+  # Valid values are: semantic, only_raise and only_fail
+  EnforcedStyle: only_raise

data/.rubocop_todo.yml

@@ -0,0 +1,43 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-12-14 14:56:02 +0100 using RuboCop version 0.52.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
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 146
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 19
+
+# Offense count: 1
+Style/ClassVars:
+  Exclude:
+    - 'lib/fog/bin/ovirt.rb'
+
+# Offense count: 1
+Style/CommentedKeyword:
+  Exclude:
+    - 'lib/fog/ovirt/models/compute/server.rb'
+
+# Offense count: 113
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 3
+Style/DoubleNegation:
+  Exclude:
+    - 'lib/fog/ovirt/models/compute/server.rb'
+    - 'tests/helpers/succeeds_helper.rb'
+
+# Offense count: 4
+Style/MultilineTernaryOperator:
+  Exclude:
+    - 'lib/fog/ovirt/models/compute/server.rb'
+    - 'lib/fog/ovirt/models/compute/template.rb'

data/.travis.yml

@@ -3,7 +3,9 @@ language: ruby
 sudo: false
 dist: trusty
 
-script: bundle exec rake test
+script:
+  - bundle exec rake rubocop
+  - bundle exec rake test
 
 rvm:
   - 2.1

data/Gemfile

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

data/Rakefile

@@ -1,4 +1,4 @@
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 # require 'rake/testtask'
 
 # Rake::TestTask.new do |t|
@@ -7,9 +7,19 @@ require 'bundler/gem_tasks'
 #   t.verbose = true
 # end
 
-mock = ENV['FOG_MOCK'] || 'true'
-  task :test do
-    sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/ovirt")
+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
+
+task :test do
+  sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/ovirt")
+end
 
-task(:default => [:test])
+task(:default => [:test])

data/fog-ovirt.gemspec

@@ -1,32 +1,33 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'fog/ovirt/version'
+require "fog/ovirt/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'fog-ovirt'
+  spec.name          = "fog-ovirt"
   spec.version       = Fog::Ovirt::VERSION
-  spec.authors       = ['Ori Rabin']
-  spec.email         = ['orabin@redhat.com']
+  spec.authors       = ["Ori Rabin"]
+  spec.email         = ["orabin@redhat.com"]
 
   spec.summary       = "Module for the 'fog' gem to support Ovirt."
-  spec.description   = 'This library can be used as a module for `fog`.'
-  spec.homepage      = 'https://github.com/fog/fog-ovirt'
-  spec.license       = 'MIT'
+  spec.description   = "This library can be used as a module for `fog`."
+  spec.homepage      = "https://github.com/fog/fog-ovirt"
+  spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^tests\/})
 
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
   spec.add_dependency("fog-core", "~> 1.45")
   spec.add_dependency("fog-json")
   spec.add_dependency("fog-xml", "~> 0.1.1")
   spec.add_dependency("rbovirt", "~> 0.1.5")
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rubocop', '~> 0.34'
-  spec.add_development_dependency 'shindo', '~> 0.3'
+  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "pry", "~> 0.10"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rubocop", "~> 0.52"
+  spec.add_development_dependency "shindo", "~> 0.3"
 end

data/lib/fog/bin/ovirt.rb

@@ -13,7 +13,7 @@ class Ovirt < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
                     when :compute
-                      Fog::Compute.new(:provider => 'Ovirt')
+                      Fog::Compute.new(:provider => "Ovirt")
                     else
                       raise ArgumentError, "Unrecognized service: #{key.inspect}"
                     end

data/lib/fog/ovirt.rb

@@ -1 +1 @@
-require 'fog/ovirt/compute'
+require "fog/ovirt/compute"

data/lib/fog/ovirt/compute.rb

@@ -1,14 +1,9 @@
-require 'fog/ovirt/core'
+require "fog/ovirt/core"
 
 module Fog
   module Compute
     class Ovirt < Fog::Service
-      requires   :ovirt_username, :ovirt_password
-      recognizes :ovirt_url,      :ovirt_server,  :ovirt_port, :ovirt_api_path, :ovirt_datacenter,
-                 :ovirt_filtered_api,
-                 :ovirt_ca_cert_store, :ovirt_ca_cert_file, :ovirt_ca_no_verify
-
-      model_path 'fog/ovirt/models/compute'
+      model_path "fog/ovirt/models/compute"
       model      :server
       collection :servers
       model      :template
@@ -28,130 +23,79 @@ module Fog
       model      :affinity_group
       collection :affinity_groups
 
-      request_path 'fog/ovirt/requests/compute'
-
-      request :vm_action
-      request :vm_start_with_cloudinit
-      request :destroy_vm
-      request :create_vm
-      request :update_vm
-      request :datacenters
-      request :storage_domains
-      request :list_virtual_machines
-      request :get_virtual_machine
-      request :list_templates
-      request :get_template
-      request :list_instance_types
-      request :get_instance_type
-      request :list_clusters
-      request :get_cluster
-      request :add_interface
-      request :destroy_interface
-      request :update_interface
-      request :list_vm_interfaces
-      request :list_template_interfaces
-      request :list_networks
-      request :vm_ticket
-      request :list_vm_volumes
-      request :list_template_volumes
-      request :list_volumes
-      request :add_volume
-      request :destroy_volume
-      request :update_volume
-      request :attach_volume
-      request :detach_volume
-      request :activate_volume
-      request :deactivate_volume
-      request :get_api_version
-      request :list_quotas
-      request :get_quota
-      request :list_affinity_groups
-      request :get_affinity_group
-      request :list_affinity_group_vms
-      request :create_affinity_group
-      request :destroy_affinity_group
-      request :add_to_affinity_group
-      request :remove_from_affinity_group
-      request :list_operating_systems
-
-      module Shared
-        # converts an OVIRT object into an hash for fog to consume.
-        def ovirt_attrs obj
-          opts = {:raw => obj}
-          obj.instance_variables.each do |v|
-            key = v.to_s.gsub("@","").to_sym
-            value = obj.instance_variable_get(v)
-            #ignore nil values
-            next if value.nil?
+      class ExceptionWrapper
+        def initialize(client)
+          @client = client
+        end
 
-            opts[key] = case value
-                        when OVIRT::Link
-                          value.id
-                        when OVIRT::TemplateVersion
-                          value
-                        when Array
-                          value
-                        when Hash
-                          value
-                        else
-                          value.to_s.strip
-                        end
+        # rubocop:disable Style/MethodMissing
+        def method_missing(symbol, *args)
+          if block_given?
+            @client.send(symbol, *args) do |*block_args|
+              yield(*block_args)
+            end
+          else
+            @client.send(symbol, *args)
           end
-          opts
+        rescue ::OVIRT::OvirtException => e
+          raise ::Fog::Ovirt::Errors::OvirtEngineError, e
         end
-      end
 
-      class Mock
-        include Shared
-
-        def initialize(options={})
-          require 'rbovirt'
+        def respond_to?(symbol, include_all = false)
+          @client.respond_to?(symbol, include_all)
         end
+        # rubocop:enable Style/MethodMissing
+      end
 
-        private
+      require "fog/ovirt/compute/v3"
 
-        def client
-          return @client if defined?(@client)
-        end
+      def self.new(options = {})
+        super()
+        @client = Fog::Compute::Ovirt::V3.new(options)
+      end
 
-        #read mocks xml
-        def read_xml(file_name)
-          file_path = File.join(File.dirname(__FILE__),"requests","compute","mock_files",file_name)
-          File.read(file_path)
-        end
+      # rubocop:disable Style/MethodMissing
+      def method_missing(symbol, *args)
+        @client.send(symbol, *args)
       end
 
-      class Real
-        include Shared
+      def respond_to?(symbol, include_all = false)
+        @client.respond_to?(symbol, include_all)
+      end
+      # rubocop:enable Style/MethodMissing
 
-        def initialize(options={})
-          require 'rbovirt'
-          username   = options[:ovirt_username]
-          password   = options[:ovirt_password]
-          server     = options[:ovirt_server]
-          port       = options[:ovirt_port]       || 8080
-          api_path   = options[:ovirt_api_path]   || '/api'
-          url        = options[:ovirt_url]        || "#{@scheme}://#{server}:#{port}#{api_path}"
+      class Mock
+        def initialize(options = {})
+          Fog::Compute::Ovirt::V3::Mock.send(:include, Fog::Compute::Ovirt::Collections)
+          @client = Fog::Compute::Ovirt::V3::Mock.new(options)
+        end
 
-          connection_opts = {}
-          connection_opts[:datacenter_id] = options[:ovirt_datacenter]
-          connection_opts[:ca_cert_store] = options[:ovirt_ca_cert_store]
-          connection_opts[:ca_cert_file]  = options[:ovirt_ca_cert_file]
-          connection_opts[:ca_no_verify]  = options[:ovirt_ca_no_verify]
-          connection_opts[:filtered_api]  = options[:ovirt_filtered_api]
+        # rubocop:disable Style/MethodMissing
+        def method_missing(symbol, *args)
+          @client.send(symbol, *args)
+        end
 
-          @client = OVIRT::Client.new(username, password, url, connection_opts)
+        def respond_to?(symbol, include_all = false)
+          @client.respond_to?(symbol, include_all)
         end
+        # rubocop:enable Style/MethodMissing
+      end
 
-        def api_version
-          client.api_version
+      class Real
+        def initialize(options = {})
+          Fog::Compute::Ovirt::V3::Real.send(:include, Fog::Compute::Ovirt::Collections)
+          @client = Fog::Compute::Ovirt::V3::Real.new(options)
         end
 
-        private
+        # rubocop:disable Style/MethodMissing
+        def method_missing(symbol, *args)
+          @client.send(symbol, *args)
+        end
 
-        def client
-          @client
+        def respond_to?(symbol, include_all = false)
+          @client.respond_to?(symbol, include_all)
         end
+        # rubocop:enable Style/MethodMissing
       end
     end
   end

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

@@ -0,0 +1,137 @@
+module Fog
+  module Compute
+    class Ovirt
+      class V3 < Fog::Service
+        requires   :ovirt_username, :ovirt_password
+        recognizes :ovirt_url,      :ovirt_server, :ovirt_port, :ovirt_api_path, :ovirt_datacenter,
+                   :ovirt_filtered_api,
+                   :ovirt_ca_cert_store, :ovirt_ca_cert_file, :ovirt_ca_no_verify
+        request_path "fog/ovirt/requests/compute/v3"
+
+        request :vm_action
+        request :vm_start_with_cloudinit
+        request :destroy_vm
+        request :create_vm
+        request :update_vm
+        request :datacenters
+        request :storage_domains
+        request :list_virtual_machines
+        request :get_virtual_machine
+        request :list_templates
+        request :get_template
+        request :list_instance_types
+        request :get_instance_type
+        request :list_clusters
+        request :get_cluster
+        request :add_interface
+        request :destroy_interface
+        request :update_interface
+        request :list_vm_interfaces
+        request :list_template_interfaces
+        request :list_networks
+        request :vm_ticket
+        request :list_vm_volumes
+        request :list_template_volumes
+        request :list_volumes
+        request :add_volume
+        request :destroy_volume
+        request :update_volume
+        request :attach_volume
+        request :detach_volume
+        request :activate_volume
+        request :deactivate_volume
+        request :get_api_version
+        request :list_quotas
+        request :get_quota
+        request :list_affinity_groups
+        request :get_affinity_group
+        request :list_affinity_group_vms
+        request :create_affinity_group
+        request :destroy_affinity_group
+        request :add_to_affinity_group
+        request :remove_from_affinity_group
+        request :list_operating_systems
+
+        module Shared
+          # converts an OVIRT object into an hash for fog to consume.
+          def ovirt_attrs(obj)
+            opts = { :raw => obj }
+            obj.instance_variables.each do |v|
+              key = v.to_s.delete("@").to_sym
+              value = obj.instance_variable_get(v)
+              # ignore nil values
+              next if value.nil?
+
+              opts[key] = case value
+                          when OVIRT::Link
+                            value.id
+                          when OVIRT::TemplateVersion
+                            value
+                          when Array
+                            value
+                          when Hash
+                            value
+                          else
+                            value.to_s.strip
+                          end
+            end
+            opts
+          end
+        end
+
+        class Mock
+          include Shared
+
+          def initialize(_options = {})
+            require "rbovirt"
+          end
+
+          private
+
+          def client
+            return @client if defined?(@client)
+          end
+
+          # read mocks xml
+          def read_xml(file_name)
+            file_path = File.join(__dir__, "../requests", "compute/v3", "mock_files", file_name)
+            File.read(file_path)
+          end
+        end
+
+        class Real
+          include Shared
+
+          # rubocop:disable Metrics/AbcSize
+          def initialize(options = {})
+            require "rbovirt"
+            username   = options[:ovirt_username]
+            password   = options[:ovirt_password]
+            server     = options[:ovirt_server]
+            port       = options[:ovirt_port]       || 8080
+            api_path   = options[:ovirt_api_path]   || "/api"
+            url        = options[:ovirt_url]        || "#{@scheme}://#{server}:#{port}#{api_path}"
+
+            connection_opts = {}
+            connection_opts[:datacenter_id] = options[:ovirt_datacenter]
+            connection_opts[:ca_cert_store] = options[:ovirt_ca_cert_store]
+            connection_opts[:ca_cert_file]  = options[:ovirt_ca_cert_file]
+            connection_opts[:ca_no_verify]  = options[:ovirt_ca_no_verify]
+            connection_opts[:filtered_api]  = options[:ovirt_filtered_api]
+
+            @client = ExceptionWrapper.new(OVIRT::Client.new(username, password, url, connection_opts))
+          end
+          # rubocop:enable Metrics/AbcSize
+
+          def api_version
+            client.api_version
+          end
+
+          private
+
+          attr_reader :client
+        end
+      end
+    end
+  end
+end