fog-vsphere 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87c94e63f2cec168825d797d960e7e0ef3adefb02687c4007b56451ae07666e7
-  data.tar.gz: 2ea05f4bf6f0fc3043d7d2f9d6323edbf82a5727c07de80ceefb7177157cf6e8
+  metadata.gz: 50674c6fa7d5ee252ada84a587b3321aa1eea6fcfdc39b6a7d4024f6aca1ff2b
+  data.tar.gz: 8ff973afd99e08033368d76e7907d5944c5cecaa5c221dcb6d967616ea30e5af
 SHA512:
-  metadata.gz: ec3396a601b88ac91360e8afd0abfee1396f2c20ce99c78eb26ad8689da89f408f74cd4333d9c1c29642189319eebd4175cfd47a376bac3bd93aafae718ec82e
-  data.tar.gz: 4ceb831473e95b93a2fc8e837e87403b717c4cc91be0d80eed77ab479e37703c2a1a2024ba685744a03014df2cd89b6f9a66eeaf9eead273b47e4e2eedc5754f
+  metadata.gz: a463bfaf886fadb3e0944aefdc7b5a93e2345d7183ccd0862a52ff735be9251e29d323d9baab700f86c9815452d66e8052149f577177d4bd6b253871480e746c
+  data.tar.gz: bb5a1ec93db10d8f59424cf0deb625a3add86471a5eecec6b81be885d738003617fd54386c5dd423c876b2afaae7f30fdb48fe11e7096fad8f47c2f2dc265aa8

data/.rubocop.yml

@@ -0,0 +1,8 @@
+inherit_from:
+  - .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.0
+
+Style/Documentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,217 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-04-18 16:02:28 +0200 using RuboCop version 0.50.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: 4
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/vm_clone.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
+# SupportedStylesAlignWith: keyword, variable, start_of_line
+Lint/EndAlignment:
+  Exclude:
+    - 'lib/fog/vsphere/models/compute/customfields.rb'
+    - 'lib/fog/vsphere/models/compute/customvalues.rb'
+    - 'lib/fog/vsphere/models/compute/tickets.rb'
+    - 'lib/fog/vsphere/models/compute/volumes.rb'
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/host_start_maintenance.rb'
+
+# Offense count: 2
+Lint/InterpolationCheck:
+  Exclude:
+    - 'tests/requests/compute/vm_power_off_tests.rb'
+    - 'tests/requests/compute/vm_suspend_tests.rb'
+
+# Offense count: 13
+Lint/RescueWithoutErrorClass:
+  Exclude:
+    - 'lib/fog/vsphere/compute.rb'
+    - 'lib/fog/vsphere/requests/compute/list_hosts.rb'
+    - 'lib/fog/vsphere/requests/compute/list_vm_cdroms.rb'
+    - 'lib/fog/vsphere/requests/compute/list_vm_volumes.rb'
+
+# Offense count: 3
+Lint/ShadowingOuterLocalVariable:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/destroy_rule.rb'
+    - 'lib/fog/vsphere/requests/compute/get_vm_first_scsi_controller.rb'
+
+# Offense count: 9
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/fog/vsphere/compute.rb'
+    - 'lib/fog/vsphere/models/compute/interfaces.rb'
+    - 'lib/fog/vsphere/models/compute/volumes.rb'
+    - 'lib/fog/vsphere/requests/compute/create_rule.rb'
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/get_interface_type.rb'
+    - 'lib/fog/vsphere/requests/compute/vm_clone.rb'
+    - 'lib/fog/vsphere/requests/compute/vm_migrate.rb'
+    - 'tests/requests/compute/vm_clone_tests.rb'
+
+# Offense count: 57
+Metrics/AbcSize:
+  Max: 633
+
+# Offense count: 12
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 263
+
+# Offense count: 21
+# Configuration parameters: CountBlocks.
+Metrics/BlockNesting:
+  Max: 5
+
+# Offense count: 6
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 452
+
+# Offense count: 15
+Metrics/CyclomaticComplexity:
+  Max: 150
+
+# Offense count: 16
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 317
+
+# Offense count: 72
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 356
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 109
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 16
+Metrics/PerceivedComplexity:
+  Max: 158
+
+# Offense count: 1
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/fog/vsphere/compute.rb'
+
+# Offense count: 15
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: snake_case, camelCase
+Naming/VariableName:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/list_datacenters.rb'
+    - 'lib/fog/vsphere/requests/compute/list_resource_pools.rb'
+    - 'lib/fog/vsphere/requests/compute/list_server_types.rb'
+    - 'lib/fog/vsphere/requests/compute/vm_clone.rb'
+    - 'tests/compute_tests.rb'
+
+# Offense count: 10
+Style/CaseEquality:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/list_child_snapshots.rb'
+    - 'lib/fog/vsphere/requests/compute/revert_to_snapshot.rb'
+    - 'tests/requests/compute/list_child_snapshots_tests.rb'
+    - 'tests/requests/compute/list_datastores_tests.rb'
+    - 'tests/requests/compute/list_hosts_tests.rb'
+    - 'tests/requests/compute/list_networks_tests.rb'
+    - 'tests/requests/compute/list_vm_cdroms_tests.rb'
+    - 'tests/requests/compute/list_vm_snapshots_tests.rb'
+
+# Offense count: 1
+Style/ClassVars:
+  Exclude:
+    - 'lib/fog/bin/vsphere.rb'
+
+# Offense count: 1
+Style/DoubleNegation:
+  Exclude:
+    - 'tests/helpers/succeeds_helper.rb'
+
+# Offense count: 12
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/fog/vsphere/compute.rb'
+    - 'lib/fog/vsphere/models/compute/interfaces.rb'
+    - 'lib/fog/vsphere/models/compute/rule.rb'
+    - 'lib/fog/vsphere/models/compute/server.rb'
+    - 'lib/fog/vsphere/requests/compute/create_group.rb'
+    - 'lib/fog/vsphere/requests/compute/create_rule.rb'
+    - 'lib/fog/vsphere/requests/compute/create_vm.rb'
+    - 'lib/fog/vsphere/requests/compute/list_resource_pools.rb'
+    - 'lib/fog/vsphere/requests/compute/list_server_types.rb'
+
+# Offense count: 2
+Style/IfInsideElse:
+  Exclude:
+    - 'lib/fog/vsphere/models/compute/cdrom.rb'
+    - 'lib/fog/vsphere/models/compute/volume.rb'
+
+# Offense count: 2
+Style/MultilineBlockChain:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/vm_clone.rb'
+
+# Offense count: 4
+Style/MultilineTernaryOperator:
+  Exclude:
+    - 'lib/fog/vsphere/models/compute/cluster.rb'
+    - 'lib/fog/vsphere/requests/compute/list_child_snapshots.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/fog/vsphere/requests/compute/list_compute_resources.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'lib/fog/vsphere/requests/compute/create_folder.rb'
+    - 'lib/fog/vsphere/requests/compute/get_folder.rb'
+    - 'lib/fog/vsphere/requests/compute/list_resource_pools.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAsExpressionSeparator.
+Style/Semicolon:
+  Exclude:
+    - 'tests/models/compute/rules_tests.rb'

data/.travis.yml

@@ -18,6 +18,7 @@ matrix:
       gemfile: Gemfile
     - rvm: jruby-head
       gemfile: Gemfile
+script: bundle exec rake travis:ci
 notifications:
   email: false
 addons:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v2.2.0
+* vm interface updating needs a datacenter as option (#140)
+* improve vm saving to use a single api call and support network changes (#142)
+
 ## v2.1.1
 * fixes an issue where networks of type DVPort cannot be listed (#137)
 

data/Rakefile

@@ -1,8 +1,17 @@
 require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
+
+desc 'Run Ruby style checks'
+RuboCop::RakeTask.new(:style)
+
+namespace :travis do
+  desc 'Run tests on Travis'
+  task ci: %w(style test)
+end
 
 mock = ENV['FOG_MOCK'] || 'true'
 task :test do
   sh("export FOG_MOCK=#{mock} && bundle exec shindont")
 end
 
-task(:default => [:test])
+task(default: [:test])

data/fog-vsphere.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fog/vsphere/version'
@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.8'
-  spec.add_development_dependency 'rubocop', '~> 0.34'
+  spec.add_development_dependency 'rubocop', '~> 0.50.0'
   spec.add_development_dependency 'shindo', '~> 0.3'
 end

data/lib/fog/bin/vsphere.rb

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

data/lib/fog/vsphere/compute.rb

@@ -83,6 +83,7 @@ module Fog
       request :get_folder
       request :list_folders
       request :create_vm
+      request :update_vm
       request :list_vm_interfaces
       request :modify_vm_interface
       request :modify_vm_volume
@@ -140,33 +141,33 @@ module Fog
         protected
 
         ATTR_TO_PROP = {
-          :id => 'config.instanceUuid',
-          :name => 'name',
-          :uuid => 'config.uuid',
-          :template => 'config.template',
-          :parent => 'parent',
-          :hostname => 'summary.guest.hostName',
-          :operatingsystem => 'summary.guest.guestFullName',
-          :ipaddress => 'guest.ipAddress',
-          :power_state => 'runtime.powerState',
-          :connection_state => 'runtime.connectionState',
-          :hypervisor => 'runtime.host',
-          :tools_state => 'guest.toolsStatus',
-          :tools_version => 'guest.toolsVersionStatus',
-          :memory_mb => 'config.hardware.memoryMB',
-          :cpus   => 'config.hardware.numCPU',
-          :corespersocket   => 'config.hardware.numCoresPerSocket',
-          :overall_status => 'overallStatus',
-          :guest_id => 'config.guestId',
-          :hardware_version => 'config.version',
-          :cpuHotAddEnabled => 'config.cpuHotAddEnabled',
-          :memoryHotAddEnabled => 'config.memoryHotAddEnabled',
-          :firmware => 'config.firmware',
-          :annotation => 'config.annotation',
-        }
+          id: 'config.instanceUuid',
+          name: 'name',
+          uuid: 'config.uuid',
+          template: 'config.template',
+          parent: 'parent',
+          hostname: 'summary.guest.hostName',
+          operatingsystem: 'summary.guest.guestFullName',
+          ipaddress: 'guest.ipAddress',
+          power_state: 'runtime.powerState',
+          connection_state: 'runtime.connectionState',
+          hypervisor: 'runtime.host',
+          tools_state: 'guest.toolsStatus',
+          tools_version: 'guest.toolsVersionStatus',
+          memory_mb: 'config.hardware.memoryMB',
+          cpus: 'config.hardware.numCPU',
+          corespersocket: 'config.hardware.numCoresPerSocket',
+          overall_status: 'overallStatus',
+          guest_id: 'config.guestId',
+          hardware_version: 'config.version',
+          cpuHotAddEnabled: 'config.cpuHotAddEnabled',
+          memoryHotAddEnabled: 'config.memoryHotAddEnabled',
+          firmware: 'config.firmware',
+          annotation: 'config.annotation'
+        }.freeze
 
         def convert_vm_view_to_attr_hash(vms)
-          vms = connection.serviceContent.propertyCollector.collectMultiple(vms,*ATTR_TO_PROP.values.uniq)
+          vms = connection.serviceContent.propertyCollector.collectMultiple(vms, *ATTR_TO_PROP.values.uniq)
           vms.map { |vm| props_to_attr_hash(*vm) }
         end
 
@@ -181,7 +182,7 @@ module Fog
           props_to_attr_hash vm_mob_ref, props
         end
 
-        def props_to_attr_hash vm_mob_ref, props
+        def props_to_attr_hash(vm_mob_ref, props)
           # NOTE: Object.tap is in 1.8.7 and later.
           # Here we create the hash object that this method returns, but first we need
           # to add a few more attributes that require additional calls to the vSphere
@@ -190,47 +191,82 @@ module Fog
           #
           # The use of the "tap" method here is a convenience, it allows us to update the
           # hash object without explicitly returning the hash at the end of the method.
-          Hash[ATTR_TO_PROP.map { |k,v| [k.to_s, props[v]] }].tap do |attrs|
+          Hash[ATTR_TO_PROP.map { |k, v| [k.to_s, props[v]] }].tap do |attrs|
             attrs['id'] ||= vm_mob_ref._ref
             attrs['mo_ref'] = vm_mob_ref._ref
             # The name method "magically" appears after a VM is ready and
             # finished cloning.
-            if attrs['hypervisor'].kind_of?(RbVmomi::VIM::HostSystem)
+            if attrs['hypervisor'].is_a?(RbVmomi::VIM::HostSystem)
               host = attrs['hypervisor']
-              attrs['datacenter'] = Proc.new { parent_attribute(host.path, :datacenter)[1] rescue nil }
-              attrs['cluster']    = Proc.new { parent_attribute(host.path, :cluster)[1] rescue nil }
-              attrs['hypervisor'] = Proc.new { host.name rescue nil }
-              attrs['resource_pool'] = Proc.new {(vm_mob_ref.resourcePool || host.resourcePool).name rescue nil}
+              attrs['datacenter'] = proc {
+                begin
+                           parent_attribute(host.path, :datacenter)[1]
+                         rescue
+                           nil
+                         end
+              }
+              attrs['cluster'] = proc {
+                begin
+                           parent_attribute(host.path, :cluster)[1]
+                         rescue
+                           nil
+                         end
+              }
+              attrs['hypervisor'] = proc {
+                begin
+                           host.name
+                         rescue
+                           nil
+                         end
+              }
+              attrs['resource_pool'] = proc {
+                begin
+                          (vm_mob_ref.resourcePool || host.resourcePool).name
+                        rescue
+                          nil
+                        end
+              }
             end
             # This inline rescue catches any standard error.  While a VM is
             # cloning, a call to the macs method will throw and NoMethodError
-            attrs['mac_addresses'] = Proc.new {vm_mob_ref.macs rescue nil}
+            attrs['mac_addresses'] = proc {
+              begin
+                        vm_mob_ref.macs
+                      rescue
+                        nil
+                      end
+            }
             # Rescue nil to catch testing while vm_mob_ref isn't reaL??
-            attrs['path'] = "/"+attrs['parent'].path.map(&:last).join('/') rescue nil
+            attrs['path'] = begin
+                              '/' + attrs['parent'].path.map(&:last).join('/')
+                            rescue
+                              nil
+                            end
           end
         end
+
         # returns the parent object based on a type
         # provides both real RbVmomi object and its name.
         # e.g.
-        #[Datacenter("datacenter-2"), "dc-name"]
-        def parent_attribute path, type
+        # [Datacenter("datacenter-2"), "dc-name"]
+        def parent_attribute(path, type)
           element = case type
-                      when :datacenter
-                        RbVmomi::VIM::Datacenter
-                      when :cluster
-                        RbVmomi::VIM::ClusterComputeResource
-                      when :host
-                        RbVmomi::VIM::HostSystem
-                      else
-                        raise "Unknown type"
+                    when :datacenter
+                      RbVmomi::VIM::Datacenter
+                    when :cluster
+                      RbVmomi::VIM::ClusterComputeResource
+                    when :host
+                      RbVmomi::VIM::HostSystem
+                    else
+                      raise 'Unknown type'
                     end
-          path.select {|x| x[0].is_a? element}.flatten
+          path.select { |x| x[0].is_a? element }.flatten
         rescue
           nil
         end
 
         # returns vmware managed obj id string
-        def managed_obj_id obj
+        def managed_obj_id(obj)
           obj.to_s.match(/\("([^"]+)"\)/)[1]
         end
 
@@ -245,174 +281,171 @@ module Fog
         def self.data
           @data ||= Hash.new do |hash, key|
             hash[key] = {
-              :servers => {
-                "5032c8a5-9c5e-ba7a-3804-832a03e16381" => {
-                 "resource_pool"    => "Resources",
-                 "memory_mb"        => 2196,
-                 "mac_addresses"    => { "Network adapter 1" => "00:50:56:a9:00:28" },
-                 "power_state"      => "poweredOn",
-                 "cpus"             => 1,
-                 "hostname"         => "dhcp75-197.virt.bos.redhat.com",
-                 "mo_ref"           => "vm-562",
-                 "connection_state" => "connected",
-                 "overall_status"   => "green",
-                 "datacenter"       => "Solutions",
-                 "volumes"          =>
+              servers: {
+                '5032c8a5-9c5e-ba7a-3804-832a03e16381' => {
+                  'resource_pool'    => 'Resources',
+                  'memory_mb'        => 2196,
+                  'mac_addresses'    => { 'Network adapter 1' => '00:50:56:a9:00:28' },
+                  'power_state'      => 'poweredOn',
+                  'cpus'             => 1,
+                  'hostname'         => 'dhcp75-197.virt.bos.redhat.com',
+                  'mo_ref'           => 'vm-562',
+                  'connection_state' => 'connected',
+                  'overall_status'   => 'green',
+                  'datacenter'       => 'Solutions',
+                  'volumes'          =>
                     [{
-                      "id"        => "6000C29c-a47d-4cd9-5249-c371de775f06",
-                      "datastore" => "Storage1",
-                      "mode"      => "persistent",
-                      "size"      => 8388608,
-                      "thin"      => true,
-                      "name"      => "Hard disk 1",
-                      "filename"  => "[Storage1] rhel6-mfojtik/rhel6-mfojtik.vmdk",
-                      "size_gb"   => 8
-                     }],
-                 "scsi_controllers" =>
-                    [{"shared_bus"  => "noSharing",
-                      "type"        => "VirtualLsiLogicController",
-                      "unit_number" => 7,
-                      "key"         => 1000
+                      'id'        => '6000C29c-a47d-4cd9-5249-c371de775f06',
+                      'datastore' => 'Storage1',
+                      'mode'      => 'persistent',
+                      'size'      => 8_388_608,
+                      'thin'      => true,
+                      'name'      => 'Hard disk 1',
+                      'filename'  => '[Storage1] rhel6-mfojtik/rhel6-mfojtik.vmdk',
+                      'size_gb'   => 8
                     }],
-                 "interfaces"       =>
-                    [{"mac"     => "00:50:56:a9:00:28",
-                      "network" => "dvportgroup-123456",
-                      "name"    => "Network adapter 1",
-                      "status"  => "ok",
-                      "summary" => "VM Network",
-                     }],
-                 "cdroms" =>
+                  'scsi_controllers' =>
+                    [{ 'shared_bus' => 'noSharing',
+                       'type'        => 'VirtualLsiLogicController',
+                       'unit_number' => 7,
+                       'key'         => 1000 }],
+                  'interfaces'       =>
+                    [{ 'mac' => '00:50:56:a9:00:28',
+                       'network' => 'dvportgroup-123456',
+                       'name'    => 'Network adapter 1',
+                       'status'  => 'ok',
+                       'summary' => 'VM Network' }],
+                  'cdroms' =>
                     [{
-                      "name"                => "CD-/DVD-Drive 1",
-                      "filename"            => nil,
-                      "key"                 => 3000,
-                      "controller_key"      => 200,
-                      "unit_number"         => 0,
-                      "start_connected"     => false,
-                      "allow_guest_control" => true,
-                      "connected"           => false,
-                     }],
-                 "hypervisor"       => "gunab.puppetlabs.lan",
-                 "guest_id"         => "rhel6_64Guest",
-                 "tools_state"      => "toolsOk",
-                 "cluster"          => "Solutionscluster",
-                 "name"             => "rhel64",
-                 "operatingsystem"  => "Red Hat Enterprise Linux 6 (64-bit)",
-                 "path"             => "/Datacenters/Solutions/vm",
-                 "uuid"             => "4229f0e9-bfdc-d9a7-7bac-12070772e6dc",
-                 "instance_uuid"    => "5032c8a5-9c5e-ba7a-3804-832a03e16381",
-                 "id"               => "5032c8a5-9c5e-ba7a-3804-832a03e16381",
-                 "tools_version"    => "guestToolsUnmanaged",
-                 "ipaddress"        => "192.168.100.184",
-                 "template"         => false
-                },
-                "502916a3-b42e-17c7-43ce-b3206e9524dc" => {
-                 "resource_pool"    => "Resources",
-                 "memory_mb"        => 512,
-                 "power_state"      => "poweredOn",
-                 "mac_addresses"    => { "Network adapter 1" => "00:50:56:a9:00:00" },
-                 "hostname"         => nil,
-                 "cpus"             => 1,
-                 "connection_state" => "connected",
-                 "mo_ref"           => "vm-621",
-                 "overall_status"   => "green",
-                 "datacenter"       => "Solutions",
-                 "volumes"          =>
-                    [{"thin"      => false,
-                      "size_gb"   => 10,
-                      "datastore" => "datastore1",
-                      "filename"  => "[datastore1] i-1342439683/i-1342439683.vmdk",
-                      "size"      => 10485762,
-                      "name"      => "Hard disk 1",
-                      "mode"      => "persistent",
-                      "id"        => "6000C29b-f364-d073-8316-8e98ac0a0eae" }],
-                 "scsi_controllers" =>
-                    [{"shared_bus"  => "noSharing",
-                      "type"        => "VirtualLsiLogicController",
-                      "unit_number" => 7,
-                      "key"         => 1000
+                      'name'                => 'CD-/DVD-Drive 1',
+                      'filename'            => nil,
+                      'key'                 => 3000,
+                      'controller_key'      => 200,
+                      'unit_number'         => 0,
+                      'start_connected'     => false,
+                      'allow_guest_control' => true,
+                      'connected'           => false
                     }],
-                 "interfaces"       =>
-                    [{ "summary" => "VM Network",
-                      "mac"     => "00:50:56:a9:00:00",
-                      "status"  => "ok",
-                      "network" => "dvportgroup-123456",
-                      "name"    => "Network adapter 1" }],
-                 "hypervisor"       => "gunab.puppetlabs.lan",
-                 "guest_id"         => nil,
-                 "cluster"          => "Solutionscluster",
-                 "tools_state"      => "toolsNotInstalled",
-                 "name"             => "i-1342439683",
-                 "operatingsystem"  => nil,
-                 "path"             => "/",
-                 "tools_version"    => "guestToolsNotInstalled",
-                 "uuid"             => "4229e0de-30cb-ceb2-21f9-4d8d8beabb52",
-                 "instance_uuid"    => "502916a3-b42e-17c7-43ce-b3206e9524dc",
-                 "id"               => "502916a3-b42e-17c7-43ce-b3206e9524dc",
-                 "ipaddress"        => nil,
-                 "template"         => false
+                  'hypervisor'       => 'gunab.puppetlabs.lan',
+                  'guest_id'         => 'rhel6_64Guest',
+                  'tools_state'      => 'toolsOk',
+                  'cluster'          => 'Solutionscluster',
+                  'name'             => 'rhel64',
+                  'operatingsystem'  => 'Red Hat Enterprise Linux 6 (64-bit)',
+                  'path'             => '/Datacenters/Solutions/vm',
+                  'uuid'             => '4229f0e9-bfdc-d9a7-7bac-12070772e6dc',
+                  'instance_uuid'    => '5032c8a5-9c5e-ba7a-3804-832a03e16381',
+                  'id'               => '5032c8a5-9c5e-ba7a-3804-832a03e16381',
+                  'tools_version'    => 'guestToolsUnmanaged',
+                  'ipaddress'        => '192.168.100.184',
+                  'template'         => false
                 },
-                "5029c440-85ee-c2a1-e9dd-b63e39364603" => {
-                 "resource_pool"    => "Resources",
-                 "memory_mb"        => 2196,
-                 "power_state"      => "poweredOn",
-                 "mac_addresses"    => { "Network adapter 1" => "00:50:56:b2:00:af" },
-                 "hostname"         => "centos56gm.localdomain",
-                 "cpus"             => 1,
-                 "connection_state" => "connected",
-                 "mo_ref"           => "vm-715",
-                 "overall_status"   => "green",
-                 "datacenter"       => "Solutions",
-                 "hypervisor"       => "gunab.puppetlabs.lan",
-                 "guest_id"         => "rhel6_64Guest",
-                 "cluster"          => "Solutionscluster",
-                 "tools_state"      => "toolsOk",
-                 "name"             => "jefftest",
-                 "operatingsystem"  => "Red Hat Enterprise Linux 6 (64-bit)",
-                 "path"             => "/Solutions/wibble",
-                 "tools_version"    => "guestToolsUnmanaged",
-                 "ipaddress"        => "192.168.100.187",
-                 "uuid"             => "42329da7-e8ab-29ec-1892-d6a4a964912a",
-                 "instance_uuid"    => "5029c440-85ee-c2a1-e9dd-b63e39364603",
-                 "id"               => "5029c440-85ee-c2a1-e9dd-b63e39364603",
-                 "template"         => false
+                '502916a3-b42e-17c7-43ce-b3206e9524dc' => {
+                  'resource_pool'    => 'Resources',
+                  'memory_mb'        => 512,
+                  'power_state'      => 'poweredOn',
+                  'mac_addresses'    => { 'Network adapter 1' => '00:50:56:a9:00:00' },
+                  'hostname'         => nil,
+                  'cpus'             => 1,
+                  'connection_state' => 'connected',
+                  'mo_ref'           => 'vm-621',
+                  'overall_status'   => 'green',
+                  'datacenter'       => 'Solutions',
+                  'volumes'          =>
+                    [{ 'thin' => false,
+                       'size_gb'   => 10,
+                       'datastore' => 'datastore1',
+                       'filename'  => '[datastore1] i-1342439683/i-1342439683.vmdk',
+                       'size'      => 10_485_762,
+                       'name'      => 'Hard disk 1',
+                       'mode'      => 'persistent',
+                       'id'        => '6000C29b-f364-d073-8316-8e98ac0a0eae' }],
+                  'scsi_controllers' =>
+                    [{ 'shared_bus' => 'noSharing',
+                       'type'        => 'VirtualLsiLogicController',
+                       'unit_number' => 7,
+                       'key'         => 1000 }],
+                  'interfaces'       =>
+                    [{ 'summary' => 'VM Network',
+                       'mac'     => '00:50:56:a9:00:00',
+                       'status'  => 'ok',
+                       'network' => 'dvportgroup-123456',
+                       'name'    => 'Network adapter 1' }],
+                  'hypervisor'       => 'gunab.puppetlabs.lan',
+                  'guest_id'         => nil,
+                  'cluster'          => 'Solutionscluster',
+                  'tools_state'      => 'toolsNotInstalled',
+                  'name'             => 'i-1342439683',
+                  'operatingsystem'  => nil,
+                  'path'             => '/',
+                  'tools_version'    => 'guestToolsNotInstalled',
+                  'uuid'             => '4229e0de-30cb-ceb2-21f9-4d8d8beabb52',
+                  'instance_uuid'    => '502916a3-b42e-17c7-43ce-b3206e9524dc',
+                  'id'               => '502916a3-b42e-17c7-43ce-b3206e9524dc',
+                  'ipaddress'        => nil,
+                  'template'         => false
+                },
+                '5029c440-85ee-c2a1-e9dd-b63e39364603' => {
+                  'resource_pool'    => 'Resources',
+                  'memory_mb'        => 2196,
+                  'power_state'      => 'poweredOn',
+                  'mac_addresses'    => { 'Network adapter 1' => '00:50:56:b2:00:af' },
+                  'hostname'         => 'centos56gm.localdomain',
+                  'cpus'             => 1,
+                  'connection_state' => 'connected',
+                  'mo_ref'           => 'vm-715',
+                  'overall_status'   => 'green',
+                  'datacenter'       => 'Solutions',
+                  'hypervisor'       => 'gunab.puppetlabs.lan',
+                  'guest_id'         => 'rhel6_64Guest',
+                  'cluster'          => 'Solutionscluster',
+                  'tools_state'      => 'toolsOk',
+                  'name'             => 'jefftest',
+                  'operatingsystem'  => 'Red Hat Enterprise Linux 6 (64-bit)',
+                  'path'             => '/Solutions/wibble',
+                  'tools_version'    => 'guestToolsUnmanaged',
+                  'ipaddress'        => '192.168.100.187',
+                  'uuid'             => '42329da7-e8ab-29ec-1892-d6a4a964912a',
+                  'instance_uuid'    => '5029c440-85ee-c2a1-e9dd-b63e39364603',
+                  'id'               => '5029c440-85ee-c2a1-e9dd-b63e39364603',
+                  'template'         => false
                 }
               },
-              :datacenters => {
-                "Solutions" => {:name => "Solutions", :status => "grey", :path => ['Solutions']}
+              datacenters: {
+                'Solutions' => { name: 'Solutions', status: 'grey', path: ['Solutions'] }
               },
-              :datastores => {
+              datastores: {
                 'Storage1' => {
                   'id' => 'datastore-123456',
                   'name' => 'Storage1',
                   'datacenter' => 'Solutions',
                   'type' => 'VMFS',
-                  'freespace' => 697471860736,
+                  'freespace' => 697_471_860_736,
                   'accessible' => true,
-                  'capacity' => 1099243192320,
-                  'uncommitted' => 977158537741,
-                  'cluster' => [],
+                  'capacity' => 1_099_243_192_320,
+                  'uncommitted' => 977_158_537_741,
+                  'cluster' => []
                 },
                 'datastore1' => {
                   'id' => 'datastore-789123',
                   'name' => 'datastore1',
                   'datacenter' => 'Solutions',
                   'type' => 'VMFS',
-                  'freespace' => 697471860736,
+                  'freespace' => 697_471_860_736,
                   'accessible' => true,
-                  'capacity' => 1099243192320,
-                  'uncommitted' => 977158537741,
-                  'cluster' => ['Solutionscluster'],
-                },
+                  'capacity' => 1_099_243_192_320,
+                  'uncommitted' => 977_158_537_741,
+                  'cluster' => ['Solutionscluster']
+                }
               },
-              :networks => {
+              networks: {
                 'network1' => {
                   'id' => 'dvportgroup-123456',
                   'name' => 'network1',
                   'datacenter' => 'Solutions',
                   'accessible' => true,
                   'virtualswitch' => nil,
-                  'cluster' => ['Solutionscluster'],
+                  'cluster' => ['Solutionscluster']
                 },
                 'network2' => {
                   'id' => 'dvportgroup-789123',
@@ -420,10 +453,10 @@ module Fog
                   'datacenter' => 'Solutions',
                   'accessible' => true,
                   'virtualswitch' => nil,
-                  'cluster' => [],
-                },
+                  'cluster' => []
+                }
               },
-              :folders => {
+              folders: {
                 'wibble' => {
                   'name' => 'wibble',
                   'datacenter' => 'Solutions',
@@ -437,92 +470,83 @@ module Fog
                   'type' => 'vm'
                 }
               },
-              :storage_pods =>
-                [{:id => "group-p123456",
-                  :name => "Datastore Cluster 1",
-                  :freespace => "4856891834368",
-                  :capacity => "7132061630464",
-                  :datacenter => "Solutions",
-                 },
-                ],
-              :clusters =>
-                [{:id => "1d4d9a3f-e4e8-4c40-b7fc-263850068fa4",
-                  :name => "Solutionscluster",
-                  :num_host => "4",
-                  :num_cpu_cores => "16",
-                  :overall_status => "green",
-                  :datacenter => "Solutions",
-                  :full_path => 'Solutionscluster',
-                  :klass => "RbVmomi::VIM::ComputeResource"
-                 },
-                 {:id => "e4195973-102b-4096-bbd6-5429ff0b35c9",
-                  :name => "Problemscluster",
-                  :num_host => "4",
-                  :num_cpu_cores => "32",
-                  :overall_status => "green",
-                  :datacenter => "Solutions",
-                  :full_path => 'Problemscluster',
-                  :klass => "RbVmomi::VIM::ComputeResource"
-                 },
-                 {
-                   :klass => "RbVmomi::VIM::Folder",
-                   :clusters => [{:id => "03616b8d-b707-41fd-b3b5-The first",
-                                  :name => "Problemscluster",
-                                  :num_host => "4",
-                                  :num_cpu_cores => "32",
-                                  :overall_status => "green",
-                                  :datacenter => "Solutions",
-                                  :full_path => 'Nested/Problemscluster',
-                                  :klass => "RbVmomi::VIM::ComputeResource"
-                                 },
-                                 {:id => "03616b8d-b707-41fd-b3b5-the Second",
-                                  :name => "Lastcluster",
-                                  :num_host => "8",
-                                  :num_cpu_cores => "32",
-                                  :overall_status => "green",
-                                  :datacenter => "Solutions",
-                                  :full_path => 'Nested/Lastcluster',
-                                  :klass => "RbVmomi::VIM::ComputeResource"}
-                   ]
-                 }
-               ],
-               :rules => {
-                 'anti-affinity-foo' => {
-                   :datacenter => 'Solutions',
-                   :cluster => 'Solutionscluster',
-                   :key => 4242,
-                   :name => 'anti-affinity-foo',
-                   :enabled => true,
-                   :type => RbVmomi::VIM::ClusterAntiAffinityRuleSpec,
-                   :vm_ids => ['5032c8a5-9c5e-ba7a-3804-832a03e16381', '502916a3-b42e-17c7-43ce-b3206e9524dc']
-                 }
-               },
-               :hosts => {
-                 'Host1' => {
-                   :datacenter => 'Solutions',
-                   :cluster => 'Solutionscluster',
-                   :name => 'host1.example.com',
-                   :model => 'PowerEdge R730',
-                   :vendor => 'Dell Inc.',
-                   :ipaddress => '1.2.3.4',
-                   :ipaddress6 => nil,
-                   :hostname => 'host1',
-                   :domainname => 'example.com',
-                   :product_name => 'VMware ESXi',
-                   :uuid => '4c4c4544-0051-3610-8046-c4c44f584a32',
-                   :cpu_cores => 20,
-                   :cpu_sockets => 2,
-                   :cpu_threads => 40,
-                   :memory => 824597241856,
-                   :product_version => '6.0.0',
-                   :vm_ids => ['5032c8a5-9c5e-ba7a-3804-832a03e16381', '502916a3-b42e-17c7-43ce-b3206e9524dc']
-                 }
-               }
+              storage_pods:                 [{ id: 'group-p123456',
+                                               name: 'Datastore Cluster 1',
+                                               freespace: '4856891834368',
+                                               capacity: '7132061630464',
+                                               datacenter: 'Solutions' }],
+              clusters:                 [{ id: '1d4d9a3f-e4e8-4c40-b7fc-263850068fa4',
+                                           name: 'Solutionscluster',
+                                           num_host: '4',
+                                           num_cpu_cores: '16',
+                                           overall_status: 'green',
+                                           datacenter: 'Solutions',
+                                           full_path: 'Solutionscluster',
+                                           klass: 'RbVmomi::VIM::ComputeResource' },
+                                         { id: 'e4195973-102b-4096-bbd6-5429ff0b35c9',
+                                           name: 'Problemscluster',
+                                           num_host: '4',
+                                           num_cpu_cores: '32',
+                                           overall_status: 'green',
+                                           datacenter: 'Solutions',
+                                           full_path: 'Problemscluster',
+                                           klass: 'RbVmomi::VIM::ComputeResource' },
+                                         {
+                                           klass: 'RbVmomi::VIM::Folder',
+                                           clusters: [{ id: '03616b8d-b707-41fd-b3b5-The first',
+                                                        name: 'Problemscluster',
+                                                        num_host: '4',
+                                                        num_cpu_cores: '32',
+                                                        overall_status: 'green',
+                                                        datacenter: 'Solutions',
+                                                        full_path: 'Nested/Problemscluster',
+                                                        klass: 'RbVmomi::VIM::ComputeResource' },
+                                                      { id: '03616b8d-b707-41fd-b3b5-the Second',
+                                                        name: 'Lastcluster',
+                                                        num_host: '8',
+                                                        num_cpu_cores: '32',
+                                                        overall_status: 'green',
+                                                        datacenter: 'Solutions',
+                                                        full_path: 'Nested/Lastcluster',
+                                                        klass: 'RbVmomi::VIM::ComputeResource' }]
+                                         }],
+              rules: {
+                'anti-affinity-foo' => {
+                  datacenter: 'Solutions',
+                  cluster: 'Solutionscluster',
+                  key: 4242,
+                  name: 'anti-affinity-foo',
+                  enabled: true,
+                  type: RbVmomi::VIM::ClusterAntiAffinityRuleSpec,
+                  vm_ids: ['5032c8a5-9c5e-ba7a-3804-832a03e16381', '502916a3-b42e-17c7-43ce-b3206e9524dc']
+                }
+              },
+              hosts: {
+                'Host1' => {
+                  datacenter: 'Solutions',
+                  cluster: 'Solutionscluster',
+                  name: 'host1.example.com',
+                  model: 'PowerEdge R730',
+                  vendor: 'Dell Inc.',
+                  ipaddress: '1.2.3.4',
+                  ipaddress6: nil,
+                  hostname: 'host1',
+                  domainname: 'example.com',
+                  product_name: 'VMware ESXi',
+                  uuid: '4c4c4544-0051-3610-8046-c4c44f584a32',
+                  cpu_cores: 20,
+                  cpu_sockets: 2,
+                  cpu_threads: 40,
+                  memory: 824_597_241_856,
+                  product_version: '6.0.0',
+                  vm_ids: ['5032c8a5-9c5e-ba7a-3804-832a03e16381', '502916a3-b42e-17c7-43ce-b3206e9524dc']
+                }
+              }
             }
           end
         end
 
-        def initialize(options={})
+        def initialize(options = {})
           require 'rbvmomi'
           @vsphere_username = options[:vsphere_username]
           @vsphere_password = 'REDACTED'
@@ -544,7 +568,7 @@ module Fog
       class Real
         include Shared
 
-        def initialize(options={})
+        def initialize(options = {})
           require 'rbvmomi'
           @vsphere_username = options[:vsphere_username]
           @vsphere_password = options[:vsphere_password]
@@ -576,21 +600,20 @@ module Fog
         def reload
           connect
           # Check if the negotiation was ever run
-          if @vsphere_is_vcenter.nil?
-            negotiate
-          end
+          negotiate if @vsphere_is_vcenter.nil?
           authenticate
         end
 
         private
+
         def negotiate_revision(revision = nil)
           # Negotiate the API revision
-          if not revision
+          unless revision
             rev = @connection.serviceContent.about.apiVersion
-            @connection.rev = [ rev, ENV['FOG_VSPHERE_REV'] || '4.1' ].max
+            @connection.rev = [rev, ENV['FOG_VSPHERE_REV'] || '4.1'].max
           end
 
-          @vsphere_is_vcenter = @connection.serviceContent.about.apiType == "VirtualCenter"
+          @vsphere_is_vcenter = @connection.serviceContent.about.apiType == 'VirtualCenter'
           @vsphere_rev = @connection.rev
         end
 
@@ -599,14 +622,14 @@ module Fog
           bad_cert = false
           loop do
             begin
-              @connection = RbVmomi::VIM.new :host => @vsphere_server,
-                                             :port => @vsphere_port,
-                                             :path => @vsphere_path,
-                                             :ns   => @vsphere_ns,
-                                             :rev  => @vsphere_rev,
-                                             :ssl  => @vsphere_ssl,
-                                             :insecure => bad_cert,
-                                             :debug => @vsphere_debug
+              @connection = RbVmomi::VIM.new host: @vsphere_server,
+                                             port: @vsphere_port,
+                                             path: @vsphere_path,
+                                             ns: @vsphere_ns,
+                                             rev: @vsphere_rev,
+                                             ssl: @vsphere_ssl,
+                                             insecure: bad_cert,
+                                             debug: @vsphere_debug
 
               # Create a shadow class to change the behaviour of @connection.obj2xml
               # so that xsd:any types are converted to xsd:int (and not xsd:long).
@@ -618,7 +641,7 @@ module Fog
               # pull request that fixes it in RbVmomi.
               #
               class <<@connection
-                def obj2xml xml, name, type, is_array, o, attrs={}
+                def obj2xml(xml, name, type, is_array, o, attrs = {})
                   case o
                   when Integer
                     attrs['xsi:type'] = 'xsd:int' if type(type) == RbVmomi::BasicTypes::AnyType
@@ -637,18 +660,14 @@ module Fog
             end
           end
 
-          if bad_cert then
-            validate_ssl_connection
-          end
+          validate_ssl_connection if bad_cert
         end
 
         def authenticate
-          begin
-            @connection.serviceContent.sessionManager.Login :userName => @vsphere_username,
-                                                            :password => @vsphere_password
-          rescue RbVmomi::VIM::InvalidLogin => e
-            raise Fog::Vsphere::Errors::ServiceError, e.message
-          end
+          @connection.serviceContent.sessionManager.Login userName: @vsphere_username,
+                                                          password: @vsphere_password
+        rescue RbVmomi::VIM::InvalidLogin => e
+          raise Fog::Vsphere::Errors::ServiceError, e.message
         end
 
         # Verify a SSL certificate based on the hashed public key
@@ -656,13 +675,13 @@ module Fog
           pubkey = @connection.http.peer_cert.public_key
           pubkey_hash = Digest::SHA2.hexdigest(pubkey.to_s)
           expected_pubkey_hash = @vsphere_expected_pubkey_hash
-          if pubkey_hash != expected_pubkey_hash then
+          if pubkey_hash != expected_pubkey_hash
             raise Fog::Vsphere::Errors::SecurityError, "The remote system presented a public key with hash #{pubkey_hash} but we're expecting a hash of #{expected_pubkey_hash || '<unset>'}.  If you are sure the remote system is authentic set vsphere_expected_pubkey_hash: <the hash printed in this message> in ~/.fog"
           end
         end
 
         def list_container_view(datacenter_obj_or_name, type, container_object = nil)
-          dc = if datacenter_obj_or_name.kind_of?(String)
+          dc = if datacenter_obj_or_name.is_a?(String)
                  find_raw_datacenter(datacenter_obj_or_name)
                else
                  datacenter_obj_or_name
@@ -675,9 +694,9 @@ module Fog
                       end
 
           container_view = connection.serviceContent.viewManager.CreateContainerView(
-            :container  => dc,
-            :type       =>  [type],
-            :recursive  => true
+            container: dc,
+            type: [type],
+            recursive: true
           )
 
           result = container_view.view