fog-vsphere 2.1.1 → 2.2.0

data/lib/fog/vsphere/models/compute/cdrom.rb

@@ -5,14 +5,14 @@ module Fog
         identity :key
 
         attribute :filename
-        attribute :name, :default => "CD-/DVD-ROM Drive"
+        attribute :name, default: 'CD-/DVD-ROM Drive'
         attribute :controller_key
         attribute :unit_number
         attribute :start_connected
         attribute :allow_guest_control
         attribute :connected
 
-        has_one_identity :server, :servers, :aliases => :instance_uuid
+        has_one_identity :server, :servers, aliases: :instance_uuid
 
         def to_s
           name
@@ -29,17 +29,17 @@ module Fog
           requires :instance_uuid
 
           if unit_number.nil?
-            used_unit_numbers = server.cdroms.map { |cdrom| cdrom.unit_number }
+            used_unit_numbers = server.cdroms.map(&:unit_number)
             max_unit_number = used_unit_numbers.max
 
-            if max_unit_number > server.cdroms.size
-              # If the max ID exceeds the number of cdroms, there must be a hole in the range. Find a hole and use it.
-              self.unit_number = max_unit_number.times.to_a.find { |i| used_unit_numbers.exclude?(i) }
-            else
-              self.unit_number = max_unit_number + 1
-            end
+            self.unit_number = if max_unit_number > server.cdroms.size
+                                 # If the max ID exceeds the number of cdroms, there must be a hole in the range. Find a hole and use it.
+                                 max_unit_number.times.to_a.find { |i| used_unit_numbers.exclude?(i) }
+                               else
+                                 max_unit_number + 1
+                               end
           else
-            if server.cdroms.any? { |cdrom| cdrom.unit_number == self.unit_number && cdrom.id != self.id }
+            if server.cdroms.any? { |cdrom| cdrom.unit_number == unit_number && cdrom.id != id }
               raise "A cdrom already exists with that unit_number, so we can't save the new cdrom"
             end
           end

data/lib/fog/vsphere/models/compute/cdroms.rb

@@ -2,10 +2,10 @@ module Fog
   module Compute
     class Vsphere
       class Cdroms < Fog::Collection
-        attribute :instance_uuid, :alias => :server_id
+        attribute :instance_uuid, alias: :server_id
         model Fog::Compute::Vsphere::Cdrom
 
-        def all(filters = {})
+        def all(_filters = {})
           load service.list_vm_cdroms(instance_uuid)
         end
 

data/lib/fog/vsphere/models/compute/cluster.rb

@@ -11,36 +11,36 @@ module Fog
         attribute :overall_status
         attribute :full_path
 
-        def resource_pools(filters = { })
-          self.attributes[:resource_pools] ||= id.nil? ? [] : service.resource_pools({
-                                                                                          :service => service,
-                                                                                          :cluster    => full_path,
-                                                                                          :datacenter => datacenter
-                                                                                        }.merge(filters))
+        def resource_pools(filters = {})
+          attributes[:resource_pools] ||= id.nil? ? [] : service.resource_pools({
+            service: service,
+            cluster: full_path,
+            datacenter: datacenter
+          }.merge(filters))
         end
 
-        def datastores(filters = { })
-          self.attributes[:datastores] ||= id.nil? ? [] : service.datastores({
-                                                                                          :service => service,
-                                                                                          :cluster    => full_path,
-                                                                                          :datacenter => datacenter
-                                                                                        }.merge(filters))
+        def datastores(filters = {})
+          attributes[:datastores] ||= id.nil? ? [] : service.datastores({
+            service: service,
+            cluster: full_path,
+            datacenter: datacenter
+          }.merge(filters))
         end
 
-        def networks(filters = { })
-          self.attributes[:networks] ||= id.nil? ? [] : service.networks({
-                                                                                          :service => service,
-                                                                                          :cluster    => full_path,
-                                                                                          :datacenter => datacenter
-                                                                                        }.merge(filters))
+        def networks(filters = {})
+          attributes[:networks] ||= id.nil? ? [] : service.networks({
+            service: service,
+            cluster: full_path,
+            datacenter: datacenter
+          }.merge(filters))
         end
 
         def rules
-          service.rules(:datacenter => datacenter, :cluster => full_path)
+          service.rules(datacenter: datacenter, cluster: full_path)
         end
 
         def hosts
-          service.hosts(:datacenter => datacenter, :cluster => full_path)
+          service.hosts(datacenter: datacenter, cluster: full_path)
         end
 
         def to_s

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

@@ -9,7 +9,7 @@ module Fog
 
         def all(filters = {})
           requires :datacenter
-          load service.list_clusters(filters.merge(:datacenter => datacenter))
+          load service.list_clusters(filters.merge(datacenter: datacenter))
         end
 
         def get(id)

data/lib/fog/vsphere/models/compute/customfields.rb

@@ -8,13 +8,13 @@ module Fog
 
         attr_accessor :vm
 
-        def all(filters = {})
-          load service.list_customfields()
+        def all(_filters = {})
+          load service.list_customfields
         end
 
         def get(key)
-          load(service.list_customfields()).find do | cv |
-            cv.key == ((key.is_a? String) ? key.to_i : key)
+          load(service.list_customfields).find do |cv|
+            cv.key == (key.is_a? String ? key.to_i : key)
           end
         end
      end

data/lib/fog/vsphere/models/compute/customvalues.rb

@@ -8,12 +8,12 @@ module Fog
 
         attr_accessor :vm
 
-        def all(filters = {})
+        def all(_filters = {})
           requires :vm
           case vm
-            when Fog::Compute::Vsphere::Server
-              load service.list_vm_customvalues(vm.id)
-            else
+          when Fog::Compute::Vsphere::Server
+            load service.list_vm_customvalues(vm.id)
+          else
             raise 'customvalues should have vm'
           end
         end
@@ -21,11 +21,11 @@ module Fog
         def get(key)
           requires :vm
           case vm
-            when Fog::Compute::Vsphere::Server
-              load service.list_vm_customvalues(vm.id)
-            else
+          when Fog::Compute::Vsphere::Server
+            load service.list_vm_customvalues(vm.id)
+          else
             raise 'customvalues should have vm'
-          end.find { | cv | cv.key == key }
+          end.find { |cv| cv.key == key }
         end
      end
     end

data/lib/fog/vsphere/models/compute/datacenter.rb

@@ -7,36 +7,36 @@ module Fog
         attribute :path
         attribute :status
 
-        def clusters filters = { }
-          service.clusters({ :datacenter => path.join("/") }.merge(filters))
+        def clusters(filters = {})
+          service.clusters({ datacenter: path.join('/') }.merge(filters))
         end
 
-        def networks filters = { }
-          service.networks({ :datacenter => path.join("/") }.merge(filters))
+        def networks(filters = {})
+          service.networks({ datacenter: path.join('/') }.merge(filters))
         end
 
-        def datastores filters = { }
-          service.datastores({ :datacenter => path.join("/") }.merge(filters))
+        def datastores(filters = {})
+          service.datastores({ datacenter: path.join('/') }.merge(filters))
         end
 
-        def storage_pods filters = { }
-          service.storage_pods({ :datacenter => path.join("/") }.merge(filters))
+        def storage_pods(filters = {})
+          service.storage_pods({ datacenter: path.join('/') }.merge(filters))
         end
 
-        def vm_folders filters = { }
-          service.folders({ :datacenter => path.join("/"), :type => :vm }.merge(filters))
+        def vm_folders(filters = {})
+          service.folders({ datacenter: path.join('/'), type: :vm }.merge(filters))
         end
 
-        def virtual_machines filters = {}
-          service.servers({ :datacenter => path.join("/") }.merge(filters))
+        def virtual_machines(filters = {})
+          service.servers({ datacenter: path.join('/') }.merge(filters))
         end
 
-        def servertypes filters={}
-          service.servertypes({:datacenter => name }.merge(filters))
+        def servertypes(filters = {})
+          service.servertypes({ datacenter: name }.merge(filters))
         end
 
-        def customfields filters = {}
-          service.customfields({ :datacenter => path.join("/")}.merge(filters))
+        def customfields(filters = {})
+          service.customfields({ datacenter: path.join('/') }.merge(filters))
         end
 
         def to_s

data/lib/fog/vsphere/models/compute/datastores.rb

@@ -8,7 +8,7 @@ module Fog
         attr_accessor :datacenter, :cluster
 
         def all(filters = {})
-          load service.list_datastores(filters.merge(:datacenter => datacenter, :cluster => cluster))
+          load service.list_datastores(filters.merge(datacenter: datacenter, cluster: cluster))
         end
 
         def get(id)

data/lib/fog/vsphere/models/compute/folder.rb

@@ -13,13 +13,13 @@ module Fog
         # Pass :recursive => true to get a Servers object that searches for VM names recursively
         def vms(options = {})
           return [] if type.to_s != 'vm'
-          service.servers(:folder => path, :datacenter => datacenter, :recursive => options[:recursive])
+          service.servers(folder: path, datacenter: datacenter, recursive: options[:recursive])
         end
 
         def to_s
           name
         end
-        
+
         def destroy
           service.folder_destroy(path, datacenter)
         end

data/lib/fog/vsphere/models/compute/folders.rb

@@ -7,10 +7,10 @@ module Fog
         model Fog::Compute::Vsphere::Folder
         attr_accessor :datacenter, :type, :path
 
-        def all(filters = { })
+        def all(filters = {})
           requires :datacenter
           requires :type
-          load service.list_folders(filters.merge(:datacenter => datacenter, :type => type, :path => path))
+          load service.list_folders(filters.merge(datacenter: datacenter, type: type, path: path))
         end
 
         def get(id)

data/lib/fog/vsphere/models/compute/hosts.rb

@@ -7,14 +7,14 @@ module Fog
 
         model Fog::Compute::Vsphere::Host
 
-        def all(filters = {})
+        def all(_filters = {})
           requires :datacenter, :cluster
-          load service.list_hosts(:datacenter => datacenter, :cluster => cluster)
+          load service.list_hosts(datacenter: datacenter, cluster: cluster)
         end
 
         def get(name)
-          all.find { |host| host.name == name } or
-            raise Fog::Compute::Vsphere::NotFound, "no such host #{name}"
+          all.find { |host| host.name == name } ||
+            raise(Fog::Compute::Vsphere::NotFound, "no such host #{name}")
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Fog
         SAVE_MUTEX = Mutex.new
 
         identity :mac
-        alias_method :id, :mac
+        alias id mac
 
         attribute :network
         attribute :name
@@ -21,12 +21,12 @@ module Fog
           # Assign server first to prevent race condition with persisted?
           self.server_id = attributes.delete(:server_id)
 
-          if attributes.key? :type then
-            if attributes[:type].is_a? String then
-              attributes[:type] = Fog::Vsphere.class_from_string(attributes[:type], "RbVmomi::VIM")
+          if attributes.key? :type
+            if attributes[:type].is_a? String
+              attributes[:type] = Fog::Vsphere.class_from_string(attributes[:type], 'RbVmomi::VIM')
             end
           else
-            attributes[:type] = Fog::Vsphere.class_from_string("VirtualE1000", "RbVmomi::VIM")
+            attributes[:type] = Fog::Vsphere.class_from_string('VirtualE1000', 'RbVmomi::VIM')
           end
 
           super defaults.merge(attributes)
@@ -44,11 +44,11 @@ module Fog
         def destroy
           requires :server_id, :key, :type
 
-          service.destroy_vm_interface(server_id, :key => key, :type => type)
+          service.destroy_vm_interface(server_id, key: key, type: type)
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted?
           requires :server_id, :type, :network
 
           # Our approach of finding the newly created interface is rough.  We assume that the :key value always increments
@@ -78,12 +78,12 @@ module Fog
         private
 
         def defaults
-          default_type=Fog.credentials[:default_nic_type] || RbVmomi::VIM::VirtualE1000
+          default_type = Fog.credentials[:default_nic_type] || RbVmomi::VIM::VirtualE1000
           {
-            :name=>"Network adapter",
-            :network=>"VM Network",
-            :summary=>"VM Network",
-            :type=> Fog::Vsphere.class_from_string(default_type, "RbVmomi::VIM"),
+            name: 'Network adapter',
+            network: 'VM Network',
+            summary: 'VM Network',
+            type: Fog::Vsphere.class_from_string(default_type, 'RbVmomi::VIM')
           }
         end
       end

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

@@ -8,19 +8,19 @@ module Fog
 
         attribute :server_id
 
-        def all(filters = {})
+        def all(_filters = {})
           requires :server_id
 
           case server
-            when Fog::Compute::Vsphere::Server
-              load service.list_vm_interfaces(server.id)
-            when Fog::Compute::Vsphere::Template
-              load service.list_template_interfaces(server.id)
-            else
+          when Fog::Compute::Vsphere::Server
+            load service.list_vm_interfaces(server.id)
+          when Fog::Compute::Vsphere::Template
+            load service.list_template_interfaces(server.id)
+          else
             raise 'interfaces should have vm or template'
           end
 
-          self.each { |interface| interface.server_id = server.id }
+          each { |interface| interface.server_id = server.id }
           self
         end
 
@@ -28,25 +28,23 @@ module Fog
           requires :server_id
 
           case server
-            when Fog::Compute::Vsphere::Server
-              interface = service.get_vm_interface(server.id, :key => id, :mac=> id, :name => id)
-            when Fog::Compute::Vsphere::Template
-              interface = service.get_template_interfaces(server.id, :key => id, :mac=> id, :name => id)
-            else
+          when Fog::Compute::Vsphere::Server
+            interface = service.get_vm_interface(server.id, key: id, mac: id, name: id)
+          when Fog::Compute::Vsphere::Template
+            interface = service.get_template_interfaces(server.id, key: id, mac: id, name: id)
+          else
 
             raise 'interfaces should have vm or template'
           end
 
           if interface
-            Fog::Compute::Vsphere::Interface.new(interface.merge(:server_id => server.id, :service => service))
-          else
-            nil
+            Fog::Compute::Vsphere::Interface.new(interface.merge(server_id: server.id, service: service))
           end
         end
 
         def new(attributes = {})
           if server_id
-            super({ :server_id => server_id  }.merge(attributes))
+            super({ server_id: server_id }.merge(attributes))
           else
             super
           end

data/lib/fog/vsphere/models/compute/interfacetype.rb

@@ -4,12 +4,12 @@ module Fog
       class Interfacetype < Fog::Model
         identity :id
 
-#        attribute :class
+        #        attribute :class
         attribute :name
         attribute :datacenter
         attribute :servertype
 
-        def initialize(attributes={} )
+        def initialize(attributes = {})
           super attributes
         end
 

data/lib/fog/vsphere/models/compute/interfacetypes.rb

@@ -8,16 +8,14 @@ module Fog
         attr_accessor :datacenter
         attr_accessor :servertype
 
-        def all(filters = { })
+        def all(filters = {})
           requires :servertype
           case servertype
-            when Fog::Compute::Vsphere::Servertype
-               load service.list_interface_types(filters.merge({
-                                                      :datacenter => datacenter,
-                                                      :servertype => servertype.id
-                                                 }))
-            else
-               raise 'interfacetypes should have a servertype'
+          when Fog::Compute::Vsphere::Servertype
+            load service.list_interface_types(filters.merge(datacenter: datacenter,
+                                                            servertype: servertype.id))
+          else
+            raise 'interfacetypes should have a servertype'
           end
         end