fog-ovirt 0.1.3 → 1.0.0

data/lib/fog/ovirt/core.rb

@@ -1,6 +1,5 @@
-require 'fog/core'
-require 'fog/xml'
-require 'rbovirt'
+require "fog/core"
+require "fog/xml"
 
 module Fog
   module Ovirt
@@ -10,8 +9,18 @@ module Fog
       class ServiceError < Fog::Errors::Error; end
       class SecurityError < ServiceError; end
       class NotFound < ServiceError; end
+      class OvirtError < Fog::Errors::Error; end
+
+      class OvirtEngineError < OvirtError
+        attr_reader :orig_exception
+
+        def initialize(exception)
+          @orig_exception = exception
+          super("Ovirt client returned an error: #{@orig_exception.message}")
+        end
+      end
     end
 
-    service(:compute, 'Compute')
+    service(:compute, "Compute")
   end
 end

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

@@ -3,11 +3,11 @@ module Fog
     class Ovirt
       class AffinityGroup < Fog::Model
         identity :id
-        
+
         attribute :name
         attribute :positive
         attribute :enforcing
-        
+
         def vms
           id.nil? ? [] : service.list_affinity_group_vms(id)
         end

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

@@ -1,5 +1,5 @@
-require 'fog/core/collection'
-require 'fog/ovirt/models/compute/affinity_group'
+require "fog/core/collection"
+require "fog/ovirt/models/compute/affinity_group"
 
 module Fog
   module Compute

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

@@ -1,5 +1,5 @@
-require 'fog/core/collection'
-require 'fog/ovirt/models/compute/cluster'
+require "fog/core/collection"
+require "fog/ovirt/models/compute/cluster"
 
 module Fog
   module Compute

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

@@ -1,5 +1,5 @@
-require 'fog/core/collection'
-require 'fog/ovirt/models/compute/instance_type'
+require "fog/core/collection"
+require "fog/ovirt/models/compute/instance_type"
 
 module Fog
   module Compute

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

@@ -1,5 +1,5 @@
-require 'fog/core/collection'
-require 'fog/ovirt/models/compute/interface'
+require "fog/core/collection"
+require "fog/ovirt/models/compute/interface"
 
 module Fog
   module Compute
@@ -9,21 +9,23 @@ module Fog
 
         attr_accessor :vm
 
-        def all(filters = {})
+        # rubocop:disable Metrics/AbcSize
+        def all(_filters = {})
           requires :vm
           if vm.is_a? Fog::Compute::Ovirt::Server
             load service.list_vm_interfaces(vm.id)
           elsif vm.is_a? Fog::Compute::Ovirt::Template
             load service.list_template_interfaces(vm.id)
           else
-            raise 'interfaces should have vm or template'
+            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)
         end
-     end
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
-require 'fog/core/collection'
-require 'fog/ovirt/models/compute/operating_system'
+require "fog/core/collection"
+require "fog/ovirt/models/compute/operating_system"
 
 module Fog
   module Compute
@@ -10,7 +10,7 @@ module Fog
         def all
           load service.list_operating_systems
         end
-     end
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
-require 'fog/core/collection'
-require 'fog/ovirt/models/compute/quota'
+require "fog/core/collection"
+require "fog/ovirt/models/compute/quota"
 
 module Fog
   module Compute
@@ -7,7 +7,7 @@ module Fog
       class Quotas < Fog::Collection
         model Fog::Compute::Ovirt::Quota
 
-	def all(filters = {})
+        def all(filters = {})
           load service.list_quotas(filters)
         end
 

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

@@ -1,4 +1,4 @@
-require 'fog/compute/models/server'
+require "fog/compute/models/server"
 
 module Fog
   module Compute
@@ -13,12 +13,12 @@ module Fog
         attribute :description
         attribute :profile
         attribute :display
-        attribute :storage,       :aliases => 'disk_size'
+        attribute :storage, :aliases => "disk_size"
         attribute :creation_time
         attribute :os
         attribute :ip
         attribute :status
-        attribute :cores,         :aliases => 'cpus'
+        attribute :cores, :aliases => "cpus"
         attribute :memory
         attribute :host
         attribute :cluster
@@ -35,16 +35,16 @@ module Fog
         attribute :disks
 
         def ready?
-          !(status =~ /down/i)
+          status !~ /down/i
         end
 
         def locked?
           @volumes = nil # force reload volumes
-          !!(status =~ /locked/i) || (attributes[:volumes]=nil) || volumes.any?{|v| !!(v.status =~ /locked/i)}
+          !!(status =~ /locked/i) || (attributes[:volumes] = nil) || volumes.any? { |v| !!(v.status =~ /locked/i) }
         end
 
         def stopped?
-          status.downcase == 'down'
+          status.casecmp("down").zero?
         end
 
         def mac
@@ -53,44 +53,44 @@ module Fog
 
         def interfaces
           @interfaces ||= id.nil? ? [] : Fog::Compute::Ovirt::Interfaces.new(
-              :service => service,
-              :vm => self
+            :service => service,
+            :vm => self
           )
         end
 
-        def add_interface attrs
+        def add_interface(attrs)
           wait_for { stopped? } if attrs[:blocking]
           service.add_interface(id, attrs)
         end
 
-        def update_interface attrs
+        def update_interface(attrs)
           wait_for { stopped? } if attrs[:blocking]
           service.update_interface(id, attrs)
         end
 
-        def destroy_interface attrs
+        def destroy_interface(attrs)
           wait_for { stopped? } if attrs[:blocking]
           service.destroy_interface(id, attrs)
         end
 
         def volumes
           @volumes ||= id.nil? ? [] : Fog::Compute::Ovirt::Volumes.new(
-              :service => service,
-              :vm => self
+            :service => service,
+            :vm => self
           )
         end
 
-        def add_volume attrs
+        def add_volume(attrs)
           wait_for { stopped? } if attrs[:blocking]
           service.add_volume(id, attrs)
         end
 
-        def destroy_volume attrs
+        def destroy_volume(attrs)
           wait_for { stopped? } if attrs[:blocking]
           service.destroy_volume(id, attrs)
         end
 
-        def update_volume attrs
+        def update_volume(attrs)
           wait_for { stopped? } if attrs[:blocking]
           service.update_volume(id, attrs)
         end
@@ -109,7 +109,7 @@ module Fog
           wait_for { stopped? } if attrs[:blocking]
           service.add_to_affinity_group(id, attrs)
         end
-        
+
         def remove_from_affinity_group(attrs)
           wait_for { stopped? } if attrs[:blocking]
           service.remove_from_affinity_group(id, attrs)
@@ -117,23 +117,25 @@ module Fog
 
         def start(options = {})
           wait_for { !locked? } if options[:blocking]
-          service.vm_action(:id =>id, :action => :start)
+          service.vm_action(:id => id, :action => :start)
           reload
         end
 
+        # rubocop:disable Metrics/AbcSize
         def start_with_cloudinit(options = {})
           wait_for { !locked? } if options[:blocking]
-          if options[:use_custom_script]
-            user_data = { :custom_script => options[:user_data] }
-          else
-            user_data = Hash[YAML.load(options[:user_data]).map{|a| [a.first.to_sym, a.last]}]
-          end
-          service.vm_start_with_cloudinit(:id =>id, :user_data =>user_data)
+          user_data = if options[:use_custom_script]
+                        { :custom_script => options[:user_data] }
+                      else
+                        Hash[YAML.safe_load(options[:user_data]).map { |a| [a.first.to_sym, a.last] }]
+                      end
+          service.vm_start_with_cloudinit(:id => id, :user_data => user_data)
           reload
         end
+        # rubocop:enable Metrics/AbcSize
 
-        def stop(options = {})
-          service.vm_action(:id =>id, :action => :stop)
+        def stop(_options = {})
+          service.vm_action(:id => id, :action => :stop)
           reload
         end
 
@@ -145,19 +147,23 @@ module Fog
           start options.merge(:blocking => true)
         end
 
-        def suspend(options = {})
-          service.vm_action(:id =>id, :action => :suspend)
+        def suspend(_options = {})
+          service.vm_action(:id => id, :action => :suspend)
           reload
         end
 
-        def destroy(options = {})
-          (stop unless stopped?) rescue nil #ignore failure, destroy the machine anyway.
+        def destroy(_options = {})
+          begin
+            (stop unless stopped?)
+          rescue StandardError
+            nil
+          end # ignore failure, destroy the machine anyway.
           wait_for { stopped? }
           service.destroy_vm(:id => id)
         end
 
         def ticket(options = {})
-          raise "Can not set console ticket, Server is not ready. Server status: #{status}" unless ready?
+          raise ::Fog::Ovirt::Errors::OvirtError, "Can not set console ticket, Server is not ready. Server status: #{status}" unless ready?
           service.vm_ticket(id, options)
         end
 

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

@@ -1,5 +1,5 @@
-require 'fog/core/collection'
-require 'fog/ovirt/models/compute/server'
+require "fog/core/collection"
+require "fog/ovirt/models/compute/server"
 
 module Fog
   module Compute

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

@@ -11,11 +11,11 @@ module Fog
         attribute :description
         attribute :profile
         attribute :display
-        attribute :storage,       :aliases => 'disk_size'
+        attribute :storage, :aliases => "disk_size"
         attribute :creation_time
         attribute :os
         attribute :status
-        attribute :cores,         :aliases => 'cpus'
+        attribute :cores, :aliases => "cpus"
         attribute :memory
         attribute :cluster
         attribute :interfaces
@@ -24,28 +24,28 @@ module Fog
 
         def interfaces
           attributes[:interfaces] ||= id.nil? ? [] : Fog::Compute::Ovirt::Interfaces.new(
-              :service => service,
-              :vm => self
+            :service => service,
+            :vm => self
           )
         end
 
         def volumes
           attributes[:volumes] ||= id.nil? ? [] : Fog::Compute::Ovirt::Volumes.new(
-              :service => service,
-              :vm => self
+            :service => service,
+            :vm => self
           )
         end
 
         def ready?
-          !(status =~ /down/i)
+          status !~ /down/i
         end
 
-        def destroy(options = {})
+        def destroy(_options = {})
           service.client.destroy_template(id)
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          raise ::Fog::Ovirt::Errors::OvirtError, "Providing an existing object may create a duplicate object" if persisted?
           service.client.create_template(attributes)
         end
 

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

@@ -1,5 +1,5 @@
-require 'fog/core/collection'
-require 'fog/ovirt/models/compute/template'
+require "fog/core/collection"
+require "fog/ovirt/models/compute/template"
 
 module Fog
   module Compute

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

@@ -3,7 +3,7 @@ module Fog
     class Ovirt
       class Volume < Fog::Model
         attr_accessor :raw
-        DISK_SIZE_TO_GB = 1073741824
+        DISK_SIZE_TO_GB = 1_073_741_824
         identity :id
 
         attribute :storage_domain
@@ -23,8 +23,8 @@ module Fog
           attributes[:size_gb] ||= attributes[:size].to_i / DISK_SIZE_TO_GB if attributes[:size]
         end
 
-        def size_gb= s
-          attributes[:size] = s.to_i * DISK_SIZE_TO_GB if s
+        def size_gb=(size)
+          attributes[:size] = size.to_i * DISK_SIZE_TO_GB if size
         end
 
         def to_s

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

@@ -1,5 +1,5 @@
-require 'fog/core/collection'
-require 'fog/ovirt/models/compute/volume'
+require "fog/core/collection"
+require "fog/ovirt/models/compute/volume"
 
 module Fog
   module Compute
@@ -9,7 +9,8 @@ module Fog
 
         attr_accessor :vm
 
-        def all(filters = {})
+        # rubocop:disable Metrics/AbcSize
+        def all(_filters = {})
           if vm.is_a? Fog::Compute::Ovirt::Server
             load service.list_vm_volumes(vm.id)
           elsif vm.is_a? Fog::Compute::Ovirt::Template
@@ -18,11 +19,12 @@ module Fog
             load service.list_volumes
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         def get(id)
           new service.get_volume(id)
         end
-     end
+      end
     end
   end
 end

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

@@ -0,0 +1,23 @@
+module Fog
+  module Compute
+    class Ovirt
+      class V3
+        class Real
+          def activate_volume(id, options)
+            raise ArgumentError, "instance id is a required parameter" unless id
+            raise ArgumentError, "volume id is a required parameter for activate-volume" unless options.key? :id
+            client.activate_volume(id, options[:id])
+          end
+        end
+
+        class Mock
+          def activate_volume(id, options)
+            raise ArgumentError, "instance id is a required parameter" unless id
+            raise ArgumentError, "volume id is a required parameter for activate-volume" unless options.key? :id
+            true
+          end
+        end
+      end
+    end
+  end
+end