fog-vsphere 2.1.1 → 2.2.0

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

@@ -14,14 +14,14 @@ module Fog
 
         # 'folder' => '/Datacenters/vm/Jeff/Templates' will be MUCH faster.
         # than simply listing everything.
-        def all(filters = { })
+        def all(filters = {})
           f = {
-            :datacenter    => datacenter,
-            :cluster       => cluster,
-            :network       => network,
-            :resource_pool => resource_pool,
-            :folder        => folder,
-            :recursive     => recursive,
+            datacenter: datacenter,
+            cluster: cluster,
+            network: network,
+            resource_pool: resource_pool,
+            folder: folder,
+            recursive: recursive
           }.merge(filters)
 
           load service.list_virtual_machines(f)
@@ -32,17 +32,16 @@ module Fog
         rescue Fog::Compute::Vsphere::NotFound
           nil
         end
-        
+
         # Pass attributes we know about down to any VM we're creating
         def new(attributes = {})
           super({
-            :datacenter    => datacenter,
-            :path          => folder,
-            :cluster       => cluster,
-            :resource_pool => resource_pool,
+            datacenter: datacenter,
+            path: folder,
+            cluster: cluster,
+            resource_pool: resource_pool
           }.merge(attributes))
         end
-        
       end
     end
   end

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

@@ -9,7 +9,7 @@ module Fog
         attribute :datacenter
         attribute :interfacetypes
 
-        def initialize(attributes={} )
+        def initialize(attributes = {})
           super defaults.merge(attributes)
         end
 
@@ -17,17 +17,17 @@ module Fog
           id
         end
 
-        def interfacetypes filters={}
-          attributes[:interfacetypes] ||= service.interfacetypes({ :datacenter => datacenter, :servertype => self }.merge(filters))
+        def interfacetypes(filters = {})
+          attributes[:interfacetypes] ||= service.interfacetypes({ datacenter: datacenter, servertype: self }.merge(filters))
         end
 
         private
 
         def defaults
           {
-            :id=>"otherGuest64",
-            :family=>"otherGuestFamily",
-            :interfacetypes => nil,
+            id: 'otherGuest64',
+            family: 'otherGuestFamily',
+            interfacetypes: nil
           }
         end
       end

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

@@ -7,8 +7,8 @@ module Fog
         model Fog::Compute::Vsphere::Servertype
         attr_accessor :datacenter, :id, :fullname
 
-        def all(filters = { })
-          load service.list_server_types(filters.merge({:datacenter => datacenter}))
+        def all(filters = {})
+          load service.list_server_types(filters.merge(datacenter: datacenter))
         end
 
         def get(id)

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

@@ -4,15 +4,14 @@ module Fog
   module Compute
     class Vsphere
       class Snapshot < Fog::Model
-
         identity  :ref
         attribute :server_id
 
         attribute :name
-        attribute :quiescedi, :default => false
-        attribute :description, :default => ''
+        attribute :quiescedi, default: false
+        attribute :description, default: ''
         attribute :create_time
-        attribute :power_state, :default => 'none'
+        attribute :power_state, default: 'none'
         attribute :ref
         attribute :mo_ref
         attribute :tree_node
@@ -21,13 +20,13 @@ module Fog
 
         def child_snapshots(filters = {})
           service.snapshots(
-            { :server_id => server_id, :parent_snapshot => self }.update(filters)
+            { server_id: server_id, parent_snapshot: self }.update(filters)
           )
         end
 
         def get_child(snapshot_ref)
           return self if ref == snapshot_ref
-          child_snapshots().get(snapshot_ref)
+          child_snapshots.get(snapshot_ref)
         end
 
         def revert

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

@@ -5,7 +5,7 @@ module Fog
   module Compute
     class Vsphere
       class Snapshots < Fog::Collection
-        attribute :server_id, :alias => :instance_uuid
+        attribute :server_id, alias: :instance_uuid
         attribute :parent_snapshot
         model Fog::Compute::Vsphere::Snapshot
 

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

@@ -4,7 +4,6 @@ module Fog
   module Compute
     class Vsphere
       class Ticket < Fog::Model
-
         attribute :server_id
 
         attribute :ticket

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

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class Vsphere
       class Volume < Fog::Model
-        DISK_SIZE_TO_GB = 1048576
+        DISK_SIZE_TO_GB = 1_048_576
         identity :id
 
         has_one :server, Server
@@ -17,9 +17,9 @@ module Fog
         attribute :size_gb
         attribute :key
         attribute :unit_number
-        attribute :controller_key, :type => :integer
+        attribute :controller_key, type: :integer
 
-        def initialize(attributes={})
+        def initialize(attributes = {})
           super defaults.merge(attributes)
         end
 
@@ -27,7 +27,7 @@ module Fog
           attributes[:size_gb] ||= attributes[:size].to_i / DISK_SIZE_TO_GB if attributes[:size]
         end
 
-        def size_gb= s
+        def size_gb=(s)
           attributes[:size] = s.to_i * DISK_SIZE_TO_GB if s
           attributes[:size_gb] = s.to_i if s
         end
@@ -52,7 +52,7 @@ module Fog
         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, :size, :datastore
 
           set_unit_number
@@ -60,9 +60,7 @@ module Fog
           data = service.add_vm_volume(self)
 
           if data['task_state'] == 'success'
-            if self.unit_number >= 7
-              self.unit_number += 1
-            end
+            self.unit_number += 1 if unit_number >= 7
 
             # We have to query vSphere to get the volume attributes since the task handle doesn't include that info.
             created = server.volumes.all.find { |volume| volume.unit_number == self.unit_number }
@@ -106,7 +104,7 @@ module Fog
           if unit_number.nil?
             self.unit_number = calculate_free_unit_number
           else
-            if server.volumes.select { |vol| vol.controller_key == controller_key }.any? { |volume| volume.unit_number == self.unit_number && volume.id != self.id }
+            if server.volumes.select { |vol| vol.controller_key == controller_key }.any? { |volume| volume.unit_number == self.unit_number && volume.id != id }
               raise "A volume already exists with that unit_number, so we can't save the new volume"
             end
           end
@@ -127,10 +125,10 @@ module Fog
 
         def defaults
           {
-            :thin => true,
-            :name => "Hard disk",
-            :mode => "persistent",
-            :controller_key => 1000
+            thin: true,
+            name: 'Hard disk',
+            mode: 'persistent',
+            controller_key: 1000
           }
         end
 
@@ -139,7 +137,7 @@ module Fog
 
           # Vsphere maps unit_numbers 7 and greater to a higher SCSI ID since the pvscsi driver reserves SCSI ID 7
           used_unit_numbers = server.volumes
-            .select { |vol| vol.unit_number && vol.controller_key == controller_key }.map(&:unit_number) + [7]
+                                    .select { |vol| vol.unit_number && vol.controller_key == controller_key }.map(&:unit_number) + [7]
           free_unit_numbers = (0..15).to_a - used_unit_numbers
 
           free_unit_numbers.first

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

@@ -8,19 +8,19 @@ module Fog
 
         model Fog::Compute::Vsphere::Volume
 
-        def all(filters = {})
+        def all(_filters = {})
           requires :server_id
 
           case server
-            when Fog::Compute::Vsphere::Server
-              load service.list_vm_volumes(server.id)
-            when Fog::Compute::Vsphere::Template
-              load service.list_template_volumes(server.id)
-            else
-              raise 'volumes should have vm or template'
+          when Fog::Compute::Vsphere::Server
+            load service.list_vm_volumes(server.id)
+          when Fog::Compute::Vsphere::Template
+            load service.list_template_volumes(server.id)
+          else
+            raise 'volumes should have vm or template'
             end
 
-          self.each { |volume| volume.server = server }
+          each { |volume| volume.server = server }
           self
         end
 
@@ -31,9 +31,9 @@ module Fog
         def new(attributes = {})
           if server_id
             # Default to the root volume datastore if one is not configured.
-            datastore = ! attributes.key?(:datastore) && self.any? ? self.first.datastore : nil
+            datastore = !attributes.key?(:datastore) && any? ? first.datastore : nil
 
-            super({ :server_id => server_id, :datastore => datastore }.merge!(attributes))
+            super({ server_id: server_id, datastore: datastore }.merge!(attributes))
           else
             super
           end

data/lib/fog/vsphere/requests/compute/cloudinit_to_customspec.rb

@@ -4,8 +4,8 @@ module Fog
       class Real
         def cloudinit_to_customspec(user_data)
           raise ArgumentError, "user_data can't be nil" if user_data.nil?
-          custom_spec = { 'customization_spec' => Hash.new }
-          user_data = YAML.load(user_data)
+          custom_spec = { 'customization_spec' => {} }
+          user_data = YAML.safe_load(user_data)
           # https://pubs.vmware.com/vsphere-55/index.jsp#com.vmware.wssdk.apiref.doc/vim.vm.customization.Specification.html
           # encryptionKey expects an array
           # globalIPSettings expects a hash, REQUIRED
@@ -16,10 +16,10 @@ module Fog
           custom_spec['encryptionKey']    = user_data['encryptionKey'] if user_data.key?('encryptionKey')
           custom_spec['globalIPSettings'] = user_data['globalIPSettings'] if user_data.key?('globalIPSettings')
           custom_spec['identity']         = user_data['identity'] if user_data.key?('identity')
-          custom_spec['identity']         = {"Sysprep"=>{"guiRunOnce"=>{"commandList"=>user_data['runcmd']}}} if user_data.key?('runcmd') and not user_data.key?('identity')
+          custom_spec['identity']         = { 'Sysprep' => { 'guiRunOnce' => { 'commandList' => user_data['runcmd'] } } } if user_data.key?('runcmd') && !user_data.key?('identity')
           custom_spec['nicSettingMap']    = user_data['nicSettingMap'] if user_data.key?('nicSettingMap')
           custom_spec['options']          = user_data['options'] if user_data.key?('options')
-          
+
           # for backwards compatability
           # hostname expects a string, REQUIRED
           # netmask expects a string
@@ -36,15 +36,15 @@ module Fog
           custom_spec['domain']                      =  user_data['domain'] if user_data.key?('domain')
           custom_spec['dnsSuffixList']               =  user_data['domainsuffixlist'] if user_data.key?('domainsuffixlist')
           custom_spec['time_zone']                   =  user_data['timezone'] if user_data.key?('timezone')
-          custom_spec  
+          custom_spec
         end
       end
 
       class Mock
         def cloudinit_to_customspec(user_data)
           raise ArgumentError, "user_data can't be nil" if user_data.nil?
-          custom_spec = { 'customization_spec' => Hash.new }
-          user_data = YAML.load(user_data)
+          custom_spec = { 'customization_spec' => {} }
+          user_data = YAML.safe_load(user_data)
           custom_spec['encryptionKey']                = user_data['encryptionKey'] if user_data.key?('encryptionKey')
           custom_spec['globalIPSettings']             = user_data['globalIPSettings'] if user_data.key?('globalIPSettings')
           custom_spec['identity']                     = user_data['identity'] if user_data.key?('identity')
@@ -58,7 +58,7 @@ module Fog
           custom_spec['domain']                       =  user_data['domain'] if user_data.key?('domain')
           custom_spec['dnsSuffixList']                =  user_data['domainsuffixlist'] if user_data.key?('domainsuffixlist')
           custom_spec['time_zone']                    =  user_data['timezone'] if user_data.key?('timezone')
-          custom_spec  
+          custom_spec
         end
       end
     end

data/lib/fog/vsphere/requests/compute/create_folder.rb

@@ -3,21 +3,21 @@ module Fog
     class Vsphere
       class Real
         def create_folder(datacenter, path, name)
-          #Path cannot be nil but it can be an empty string
-          raise ArgumentError, "Path cannot be nil" if path.nil?
+          # Path cannot be nil but it can be an empty string
+          raise ArgumentError, 'Path cannot be nil' if path.nil?
 
           parent_folder = get_raw_vmfolder(path, datacenter)
           begin
-            new_folder = parent_folder.CreateFolder(:name => name)
+            new_folder = parent_folder.CreateFolder(name: name)
             # output is cleaned up to return the new path
             # new path will be path/name, example: "Production/Pool1"
-            new_folder.path.reject { |a| a.first.class == "Folder" }.map { |a| a.first.name }.join("/").sub(/^\/?Datacenters\/#{datacenter}\/vm\/?/, '')
+            new_folder.path.reject { |a| a.first.class == 'Folder' }.map { |a| a.first.name }.join('/').sub(/^\/?Datacenters\/#{datacenter}\/vm\/?/, '')
           end
         end
       end
       class Mock
         def create_folder(datacenter, path, name)
-          self.data[:folders][name] = {
+          data[:folders][name] = {
             'name'       => name,
             'datacenter' => datacenter,
             'path'       => "#{path}/#{name}",

data/lib/fog/vsphere/requests/compute/create_group.rb

@@ -2,21 +2,21 @@ module Fog
   module Compute
     class Vsphere
       class Real
-        def create_group(attributes={})
+        def create_group(attributes = {})
           cluster = get_raw_cluster(attributes[:cluster], attributes[:datacenter])
-          group = cluster.configurationEx.group.find {|n| n[:name] == attributes[:name]}
+          group = cluster.configurationEx.group.find { |n| n[:name] == attributes[:name] }
           if group
             raise ArgumentError, "Group #{attributes[:name]} already exists!"
           end
           spec = get_group_spec attributes
           cluster_spec = RbVmomi::VIM.ClusterConfigSpecEx(groupSpec: [
-              RbVmomi::VIM.ClusterGroupSpec(
-                  operation: RbVmomi::VIM.ArrayUpdateOperation('add'),
-                  info: spec
-              )
-          ])
+                                                            RbVmomi::VIM.ClusterGroupSpec(
+                                                              operation: RbVmomi::VIM.ArrayUpdateOperation('add'),
+                                                              info: spec
+                                                            )
+                                                          ])
           cluster.ReconfigureComputeResource_Task(spec: cluster_spec, modify: true).wait_for_completion
-          group = cluster.configurationEx.group.find {|n| n[:name] == attributes[:name]}
+          group = cluster.configurationEx.group.find { |n| n[:name] == attributes[:name] }
           if group
             return group[:name]
           else
@@ -26,25 +26,25 @@ module Fog
 
         private
 
-        def get_group_spec(attributes={})
+        def get_group_spec(attributes = {})
           if attributes[:type].to_s == 'ClusterVmGroup'
-            vms = attributes[:vm_ids].to_a.map {|id| get_vm_ref(id, attributes[:datacenter])}
+            vms = attributes[:vm_ids].to_a.map { |id| get_vm_ref(id, attributes[:datacenter]) }
             attributes[:type].new(
-                name: attributes[:name],
-                vm: vms
+              name: attributes[:name],
+              vm: vms
             )
           elsif attributes[:type].to_s == 'ClusterHostGroup'
             attributes[:type].new(
-                name: attributes[:name],
-                host: attributes[:host_refs]
+              name: attributes[:name],
+              host: attributes[:host_refs]
             )
           end
         end
       end
 
       class Mock
-        def create_group(attributes={})
-          self.data[:groups][attributes[:name]] = attributes
+        def create_group(attributes = {})
+          data[:groups][attributes[:name]] = attributes
         end
       end
     end

data/lib/fog/vsphere/requests/compute/create_rule.rb

@@ -2,22 +2,22 @@ module Fog
   module Compute
     class Vsphere
       class Real
-        def create_rule(attributes={})
+        def create_rule(attributes = {})
           cluster = get_raw_cluster(attributes[:cluster], attributes[:datacenter])
-          rule = cluster.configurationEx.rule.find {|n| n[:name] == attributes[:name]}
+          rule = cluster.configurationEx.rule.find { |n| n[:name] == attributes[:name] }
           if rule
             raise ArgumentError, "Rule #{attributes[:name]} already exists!"
           end
           spec = get_rule_spec attributes
           # Now, attach it to the cluster
           cluster_spec = RbVmomi::VIM.ClusterConfigSpecEx(rulesSpec: [
-              RbVmomi::VIM.ClusterRuleSpec(
-                  operation: RbVmomi::VIM.ArrayUpdateOperation('add'),
-                  info: spec
-              )
-          ])
+                                                            RbVmomi::VIM.ClusterRuleSpec(
+                                                              operation: RbVmomi::VIM.ArrayUpdateOperation('add'),
+                                                              info: spec
+                                                            )
+                                                          ])
           ret = cluster.ReconfigureComputeResource_Task(spec: cluster_spec, modify: true).wait_for_completion
-          rule = cluster.configurationEx.rule.find {|n| n[:name] == attributes[:name]}
+          rule = cluster.configurationEx.rule.find { |n| n[:name] == attributes[:name] }
           if rule
             return rule[:key]
           else
@@ -27,9 +27,9 @@ module Fog
 
         private
 
-        def get_rule_spec(attributes={})
-          if (attributes[:type].to_s == 'ClusterAntiAffinityRuleSpec' || attributes[:type].to_s == 'ClusterAffinityRuleSpec')
-            vms = attributes[:vm_ids].to_a.map {|id| get_vm_ref(id, attributes[:datacenter])}
+        def get_rule_spec(attributes = {})
+          if attributes[:type].to_s == 'ClusterAntiAffinityRuleSpec' || attributes[:type].to_s == 'ClusterAffinityRuleSpec'
+            vms = attributes[:vm_ids].to_a.map { |id| get_vm_ref(id, attributes[:datacenter]) }
             attributes[:type].new(
               name: attributes[:name],
               enabled: attributes[:enabled],
@@ -48,9 +48,9 @@ module Fog
       end
 
       class Mock
-        def create_rule(attributes={})
+        def create_rule(attributes = {})
           attributes[:key] = rand(9999)
-          self.data[:rules][attributes[:name]] = attributes
+          data[:rules][attributes[:name]] = attributes
           attributes[:key]
         end
       end