fog-vsphere 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5281df844dc5370c7eeb4aa1b6d062edc780650cfa26143ef122a9f719b1305
-  data.tar.gz: ddd9c2dfe8393e74aa74267406f23638047f52ae426dcb98b30d0db64666e5d2
+  metadata.gz: 45a6779fc97119bf814c810a3953731bb574e97dc2a806922cfe7291f34c5acb
+  data.tar.gz: 8606ad0e48b0715b2cfcbbc4e2d1e5976f93a6bce82942fb456d8c3acdd37b85
 SHA512:
-  metadata.gz: cf18dc5cee08a4be3919c5473237ad83ba609d95868891dd7afb43d8d0aacd4d89ff05f211e3a89e25610aa3b5ee0da75f846fbbfdd7a3d1e3b9301d860f7586
-  data.tar.gz: 597988c88827a950b9ff4ab4363c344f72ebca5833cae3397358ddab8fae9f4f63813c8fa54826c3c2956e0469898165e582f4ef17406c22bd95d1b9c1fd34fd
+  metadata.gz: 02a8cf0c88859c98f9afb68f69b78b634e7db977a37ee457923c7bcad9cfe75721663bd353a974f16c9dbd3a93b11b5341f89a0b5e23836cf25b110a66925702
+  data.tar.gz: e01bdf1f3c62f9be49e1a0d056823e411c49d5d95d736c3e668549442f9a36eafd9d6622b9f61126934f59eb96ce319abc94bf9aefa254265bf6cdc1d9927e49

data/.rubocop.yml

@@ -6,3 +6,36 @@ AllCops:
 
 Style/Documentation:
   Enabled: false
+
+HashSyntax:
+  Enabled: false # don't force 1.9 hash syntax
+
+Style/StringLiterals:
+  Enabled: false # dont't enforce
+
+Style/WordArray:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false # don't enforce this
+
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled : false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Performance/Casecmp:
+  Enabled: false
+
+Style/RescueModifier:
+  Enabled: false
+
+Metrics/MethodLength:
+  Max: 45

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-04-18 16:02:28 +0200 using RuboCop version 0.50.0.
+# on 2018-11-15 11:16:00 -0500 using RuboCop version 0.49.1.
 # 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
@@ -26,20 +26,6 @@ Lint/EndAlignment:
     - '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:
@@ -60,14 +46,14 @@ Lint/UselessAssignment:
     - 'lib/fog/vsphere/requests/compute/vm_migrate.rb'
     - 'tests/requests/compute/vm_clone_tests.rb'
 
-# Offense count: 57
+# Offense count: 64
 Metrics/AbcSize:
-  Max: 633
+  Max: 635
 
 # Offense count: 12
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 263
+  Max: 264
 
 # Offense count: 21
 # Configuration parameters: CountBlocks.
@@ -77,22 +63,22 @@ Metrics/BlockNesting:
 # Offense count: 6
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 452
+  Max: 284
 
-# Offense count: 15
+# Offense count: 19
 Metrics/CyclomaticComplexity:
-  Max: 150
+  Max: 151
 
-# Offense count: 16
+# Offense count: 819
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 317
 
-# Offense count: 72
+# Offense count: 80
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 356
+  Max: 358
 
 # Offense count: 1
 # Configuration parameters: CountComments.
@@ -104,31 +90,9 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 16
+# Offense count: 20
 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'
+  Max: 159
 
 # Offense count: 10
 Style/CaseEquality:
@@ -152,7 +116,7 @@ Style/DoubleNegation:
   Exclude:
     - 'tests/helpers/succeeds_helper.rb'
 
-# Offense count: 12
+# Offense count: 14
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
@@ -165,6 +129,7 @@ Style/GuardClause:
     - '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'
+    - 'lib/fog/vsphere/requests/compute/vm_relocate.rb'
 
 # Offense count: 2
 Style/IfInsideElse:
@@ -199,6 +164,22 @@ Style/PercentLiteralDelimiters:
   Exclude:
     - 'Rakefile'
 
+# Offense count: 1
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Style/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/fog/vsphere/compute.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Exclude:
+    - 'lib/fog/vsphere/models/compute/volume.rb'
+
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
@@ -215,3 +196,14 @@ Style/RegexpLiteral:
 Style/Semicolon:
   Exclude:
     - 'tests/models/compute/rules_tests.rb'
+
+# Offense count: 14
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: snake_case, camelCase
+Style/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'

data/.travis.yml

@@ -20,7 +20,8 @@ matrix:
       gemfile: Gemfile
 script: bundle exec rake travis:ci
 notifications:
-  email: false
+  email:
+    - chrobert@redhat.com
 addons:
   code_climate:
     repo_token: 44bcd04b60228fc94f2be3a5e0346441b5ea156e94e89a17fc24c5d3de483721

data/CHANGELOG.md

@@ -1,4 +1,16 @@
+## v2.5.0
+
+* Expose extraConfig from user_data for vm_clone #172
+* Support getting folder types other than vm folder #171
+* Vm_clone: ERROR if options['volumes'] is not specified #170
+* Patch attribute[:datacenter] for create interface #167
+* Add required datacenter param to all calls which may use get_vm_interface #165
+* Add option to relocate vm's datastore #164
+* Add cpu_hz attribute to host (#162)
+* Fix adding 8th volume to vm (#146)
+
 ## v2.4.0
+
 * improve folder loading performance (#158)
 * improve storage pod loading performance (#160)
 * improve datastore loading performance (#159)
@@ -8,18 +20,22 @@
 * add server guard to unit_number calculation (#152)
 
 ## v2.3.0
+
 * set volume unit_number when cloning a vm (#151)
 * add unclustered esxi hosts back to cluster selection (#149)
 * reduce the time required to list networks (#145)
 
 ## 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)
 
 ## v2.1.0
+
 * fixes two issues that broke vm cloning (#134, #135)
 * performance of host listing was improved (#131)
 * networks have a vlan property (#129)

data/lib/fog/vsphere/compute.rb

@@ -1,5 +1,5 @@
 require 'digest/sha2'
-
+# rubocop:disable Lint/RescueWithoutErrorClass
 module Fog
   module Compute
     class Vsphere < Fog::Service
@@ -182,6 +182,7 @@ module Fog
           props_to_attr_hash vm_mob_ref, props
         end
 
+        # rubocop:disable Metrics/MethodLength
         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
@@ -249,6 +250,7 @@ module Fog
         # provides both real RbVmomi object and its name.
         # e.g.
         # [Datacenter("datacenter-2"), "dc-name"]
+        # rubocop:enable Metrics/MethodLength
         def parent_attribute(path, type)
           element = case type
                     when :datacenter
@@ -277,7 +279,7 @@ module Fog
 
       class Mock
         include Shared
-
+        # rubocop:disable Metrics/MethodLength
         def self.data
           @data ||= Hash.new do |hash, key|
             hash[key] = {
@@ -537,6 +539,7 @@ module Fog
                   cpu_cores: 20,
                   cpu_sockets: 2,
                   cpu_threads: 40,
+                  cpu_hz: 2_599_999_534,
                   memory: 824_597_241_856,
                   product_version: '6.0.0',
                   vm_ids: ['5032c8a5-9c5e-ba7a-3804-832a03e16381', '502916a3-b42e-17c7-43ce-b3206e9524dc']
@@ -546,6 +549,7 @@ module Fog
           end
         end
 
+        # rubocop:enable Metrics/MethodLength
         def initialize(options = {})
           require 'rbvmomi'
           @vsphere_username = options[:vsphere_username]

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

@@ -9,6 +9,7 @@ module Fog
         attribute :cpu_cores
         attribute :cpu_sockets
         attribute :cpu_threads
+        attribute :cpu_hz
         attribute :memory
         attribute :uuid
         attribute :ipaddress

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

@@ -44,7 +44,7 @@ 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, datacenter: server.datacenter)
         end
 
         def save
@@ -55,6 +55,7 @@ module Fog
           # and thus the highest :key value must correspond to the created interface.  Since this has an inherent race
           # condition we need to gate the saves.
           SAVE_MUTEX.synchronize do
+            attributes[:datacenter] = server.datacenter unless attributes.key?(:datacenter)
             data = service.add_vm_interface(server_id, attributes)
 
             if data['task_state'] == 'success'

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

@@ -29,7 +29,7 @@ module Fog
 
           case server
           when Fog::Compute::Vsphere::Server
-            interface = service.get_vm_interface(server.id, key: id, mac: id, name: id)
+            interface = service.get_vm_interface(server.id, key: id, mac: id, name: id, datacenter: server.datacenter)
           when Fog::Compute::Vsphere::Template
             interface = service.get_template_interfaces(server.id, key: id, mac: id, name: id)
           else

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

@@ -230,6 +230,7 @@ module Fog
 
         def update_interface(attrs)
           wait_for { !ready? } if interface_ready? attrs
+          attrs[:datacenter] = datacenter unless attrs.key? :datacenter
           service.update_vm_interface(id, attrs)
         end
 

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

@@ -60,8 +60,6 @@ module Fog
           data = service.add_vm_volume(self)
 
           if data['task_state'] == 'success'
-            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 }
 

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

@@ -12,6 +12,7 @@ module Fog
           # identity expects an hash, REQUIRED
           # nicSettingMap expects an array
           # options expects an hash
+          # extraConfig expects a hash
 
           custom_spec['encryptionKey']    = user_data['encryptionKey'] if user_data.key?('encryptionKey')
           custom_spec['globalIPSettings'] = user_data['globalIPSettings'] if user_data.key?('globalIPSettings')
@@ -19,6 +20,7 @@ module Fog
           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')
+          custom_spec['extraConfig']      = user_data['extraConfig'] if user_data.key?('extraConfig')
 
           # for backwards compatability
           # hostname expects a string, REQUIRED
@@ -50,6 +52,7 @@ module Fog
           custom_spec['identity']                     = user_data['identity'] if 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')
+          custom_spec['extraConfig']                  = user_data['extraConfig'] if user_data.key?('extraConfig')
           custom_spec['hostname']                     =  user_data['hostname'] if user_data.key?('hostname')
           custom_spec['ipsettings']                   =  { 'ip' => user_data['ip'] } if user_data.key?('ip')
           custom_spec['ipsettings']['subnetMask']     =  user_data['netmask'] if user_data.key?('netmask')

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

@@ -14,8 +14,9 @@ module Fog
           raw_datacenters.find { |d| d.name == name } || get_raw_datacenter(name)
         end
 
-        def get_raw_datacenter(name)
-          connection.serviceInstance.find_datacenter(name)
+        # @note RbVmomi takes path instead of name as argument to find datacenter
+        def get_raw_datacenter(path)
+          connection.serviceInstance.find_datacenter(path)
         end
       end
 

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

@@ -4,33 +4,32 @@ module Fog
       class Real
         def get_folder(path, datacenter_name, type = nil)
           type ||= 'vm'
-
           # Cycle through all types of folders.
-          case type
-          when 'vm', :vm
-            # if you're a vm then grab the VM.
-            folder = get_raw_vmfolder(path, datacenter_name)
-            raise(Fog::Compute::Vsphere::NotFound) unless folder
-            folder_attributes(folder, datacenter_name)
-          when 'network', :network
-            raise 'not implemented'
-          when 'datastore', :datastore
-            raise 'not implemented'
-          else
-            raise ArgumentError, "#{type} is unknown"
-          end
+          folder = get_raw_folder(path, datacenter_name, type)
+          raise(Fog::Compute::Vsphere::NotFound) unless folder
+          folder_attributes(folder, datacenter_name)
         end
 
         protected
 
-        def get_raw_vmfolder(path, datacenter_name)
+        def get_raw_folder(path, datacenter_name_or_obj, type)
           # The required path syntax - 'topfolder/subfolder
 
           # Clean up path to be relative since we're providing datacenter name
-          dc             = find_raw_datacenter(datacenter_name)
-          dc_root_folder = dc.vmFolder
+          dc = if datacenter_name_or_obj.is_a?(String)
+                 find_raw_datacenter(datacenter_name_or_obj)
+               else
+                 datacenter_name_or_obj
+               end
+
+          valid_types = %w[vm network datastore host]
+          raise ArgumentError, "#{type} is unknown" if type.blank?
+          raise "Invalid type (#{type}). Must be one of #{valid_types.join(', ')} " unless valid_types.include?(type.to_s)
+          meth = "#{type}Folder"
+          dc_root_folder = dc.send(meth)
+
           # Filter the root path for this datacenter not to be used."
-          dc_root_folder_path = dc_root_folder.path.map { |_id, name| name }.join('/')
+          dc_root_folder_path = dc_root_folder.path.map { |_, name| name }.join('/')
           paths = path.sub(/^\/?#{Regexp.quote(dc_root_folder_path)}\/?/, '').split('/')
 
           return dc_root_folder if paths.empty?
@@ -46,6 +45,10 @@ module Fog
           end
         end
 
+        def get_raw_vmfolder(path, datacenter_name)
+          get_raw_folder(path, datacenter_name, 'vm')
+        end
+
         def folder_attributes(folder, datacenter_name)
           {
             id: managed_obj_id(folder),
@@ -65,6 +68,7 @@ module Fog
           return :vm        if types.include?('VirtualMachine')
           return :network   if types.include?('Network')
           return :datastore if types.include?('Datastore')
+          return :host      if types.include?('ComputeResource')
         end
       end
 

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

@@ -1,3 +1,4 @@
+# rubocop:disable Lint/RescueWithoutErrorClass
 module Fog
   module Compute
     class Vsphere
@@ -77,6 +78,7 @@ module Fog
             cpu_cores:       'hardware.cpuInfo.numCpuCores',
             cpu_sockets:     'hardware.cpuInfo.numCpuPackages',
             cpu_threads:     'hardware.cpuInfo.numCpuThreads',
+            cpu_hz:          'hardware.cpuInfo.hz',
             memory:          'hardware.memorySize',
             uuid:            'hardware.systemInfo.uuid',
             model:           'hardware.systemInfo.model',

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

@@ -1,3 +1,4 @@
+# rubocop:disable Lint/RescueWithoutErrorClass
 module Fog
   module Compute
     class Vsphere

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

@@ -1,3 +1,4 @@
+# rubocop:disable Lint/RescueWithoutErrorClass
 module Fog
   module Compute
     class Vsphere

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

@@ -13,7 +13,7 @@ module Fog
           raise ArgumentError, 'instance id is a required parameter' unless vmid
 
           interface = get_interface_from_options(vmid, options.merge(server_id: vmid))
-          vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => { 'deviceChange' => [create_interface(interface, interface.key, :remove)] })
+          vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => { 'deviceChange' => [create_interface(interface, interface.key, :remove, options)] })
         end
 
         def update_vm_interface(vmid, options = {})

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

@@ -93,6 +93,7 @@ module Fog
         #        existing disks as well as add or remove them. The
         #        resizing is applied only when the size is bigger then the
         #        in size in the template
+        # rubocop:disable Metrics/MethodLength
         def vm_clone(options = {})
           # Option handling
           options = vm_clone_check_options(options)
@@ -631,7 +632,9 @@ module Fog
           end
           # relocate templates is not supported by fog-vsphere when vm is cloned on a storage pod
           unless options.key?('storage_pod')
-            relocation_spec[:disk] = relocate_template_volumes_specs(vm_mob_ref, options['volumes'], options['datacenter'])
+            unless options['volumes'].blank?
+              relocation_spec[:disk] = relocate_template_volumes_specs(vm_mob_ref, options['volumes'], options['datacenter'])
+            end
           end
           # And the clone specification
           clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(location: relocation_spec,
@@ -711,6 +714,7 @@ module Fog
             'task_ref'      => task._ref
           }
         end
+        # rubocop:enable Metrics/MethodLength
 
         # Build up the network config spec for simple case:
         # simple case: apply just the network_label, nic_type and network_adapter_device_key

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

@@ -2,18 +2,31 @@ module Fog
   module Compute
     class Vsphere
       class Real
-        # Clones a VM from a template or existing machine on your vSphere
-        # Server.
+        # Relocates a VM to different host or datastore.
         #
         # ==== Parameters
         # * options<~Hash>:
         #   * 'instance_uuid'<~String> - *REQUIRED* VM to relocate
         #   * 'host'<~String> - name of host which will run the VM.
+        #   * 'cluster'<~String> - name of cluster where host is.
+        #       Only works with clusters within same datacenter as
+        #       where vm is running. Defaults to vm's host's cluster.
+        #   * 'datacenter'<~String> - name of datacenter where host is.
+        #       It must be same datacenter as where vm is running.
+        #       Defaults to vm's datacenter.
+        #   * 'datastore'<~String> - name of datastore where VM will
+        #       be located.
         #   * 'pool'<~String> - name of pool which the VM should be
         #       attached.
         #   * 'disks'<~Array> - disks to relocate. Each disk is a
         #       hash with diskId wich is key attribute of volume,
-        #       and datastore to relocate to.
+        #       and datastore to relocate to. diskBackingInfo can be provided,
+        #       with type FlatVer2 or SeSparse
+        #       Example: [{
+        #         'diskId' => 2000,
+        #         'datastore' => 'datastore_name',
+        #         'diskBackingInfo' => {'type' => 'FlatVer2', ...}
+        #       }]
         def vm_relocate(options = {})
           raise ArgumentError, 'instance_uuid is a required parameter' unless options.key? 'instance_uuid'
 
@@ -25,14 +38,25 @@ module Fog
             raise Fog::Vsphere::Errors::NotFound,
                   "Could not find VirtualMachine with instance uuid #{options['instance_uuid']}"
           end
-          options['host'] = get_raw_host(options['host'], options['cluster'], options['datacenter']) if options['host']
+          datacenter = options['datacenter'] || get_vm_datacenter(vm_mob_ref)
+          cluster_name = options['cluster'] || get_vm_cluster(vm_mob_ref)
+
+          options['host'] = get_raw_host(options['host'], cluster_name, datacenter) if options['host']
+          options['datastore'] = get_raw_datastore(options['datastore'], datacenter) if options.key?('datastore')
+
           if options['disks']
             options['disks'] = options['disks'].map do |disk|
-              disk['datastore'] = get_raw_datastore(disk['datastore'], nil)
+              disk['datastore'] = get_raw_datastore(disk['datastore'], datacenter)
+              if disk['diskBackingInfo'] && disk['diskBackingInfo']['type']
+                backing_type = "VirtualDisk#{disk['diskBackingInfo'].delete('type')}BackingInfo"
+                disk['diskBackingInfo'] = RbVmomi::VIM.send(backing_type, disk['diskBackingInfo'])
+              end
               RbVmomi::VIM::VirtualMachineRelocateSpecDiskLocator(disk)
             end
           end
+
           spec = RbVmomi::VIM::VirtualMachineRelocateSpec(
+            datastore: options['datastore'],
             pool: options['pool'],
             host: options['host'],
             disk: options['disks']
@@ -41,6 +65,30 @@ module Fog
           task.wait_for_completion
           { 'task_state' => task.info.state }
         end
+
+        def get_vm_datacenter(vm_mob_ref)
+          parent = vm_mob_ref.parent
+          until parent.is_a?(RbVmomi::VIM::Datacenter)
+            if vm_mob_ref.respond_to?(:parent)
+              parent = parent.parent
+            else
+              return
+            end
+          end
+          parent.name
+        end
+
+        def get_vm_cluster(vm_mob_ref)
+          parent = vm_mob_ref.runtime.host.parent
+          until parent.is_a?(RbVmomi::VIM::ClusterComputeResource)
+            if vm_mob_ref.respond_to?(:parent)
+              parent = parent.parent
+            else
+              return
+            end
+          end
+          parent.name
+        end
       end
 
       class Mock

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '2.4.0'.freeze
+    VERSION = '2.5.0'.freeze
   end
 end

data/tests/compute_tests.rb

@@ -10,6 +10,7 @@ Shindo.tests('Fog::Compute[:vsphere]', ['vsphere']) do
         @parent = @_ref = 'vm-123'
       end
 
+      # rubocop:disable Style/VariableName
       def collect!(*_pathSet)
         { '_ref' => 'vm-123', 'name' => 'fakevm' }
       end

data/tests/requests/compute/vm_power_off_tests.rb

@@ -14,7 +14,7 @@ Shindo.tests('Fog::Compute[:vsphere] | vm_power_off request', ['vsphere']) do
   { true => 'cut_power', false => 'shutdown_guest' }.each do |force, expected|
     tests("When 'force' => #{force}") do
       response = compute.vm_power_off('instance_uuid' => powered_on_vm, 'force' => force)
-      test('should retur power_off_type of #{expected}') { response['power_off_type'] == expected }
+      test("should retur power_off_type of #{expected}") { response['power_off_type'] == expected }
     end
   end
 

data/tests/requests/compute/vm_suspend_tests.rb

@@ -13,7 +13,7 @@ Shindo.tests('Fog::Compute[:vsphere] | vm_suspend request', ['vsphere']) do
   { true => 'suspend', false => 'standby_guest' }.each do |force, expected|
     tests("When 'force' => #{force}") do
       response = compute.vm_suspend('instance_uuid' => powered_on_vm, 'force' => force)
-      test('should return suspend_type of #{expected}') { response['suspend_type'] == expected }
+      test("should return suspend_type of #{expected}") { response['suspend_type'] == expected }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -328,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.