chef-provisioning-vsphere 0.5.6 → 0.5.7.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc055e1b2d6b786a8f6283601e4b639d8c366721
-  data.tar.gz: 055c8b542e35ac504d6e32a17fe220efcfdc2d1e
+  metadata.gz: c95b01dfc2b3264c2e059c2c2251994e346ecdb9
+  data.tar.gz: 39fcb92ec638a6002688e89a75b4040648ebd009
 SHA512:
-  metadata.gz: 3de7ecf45f3b2cb52a0d56e1f0e9807f328d7268908b7519023e678fb061990aec6dbc159034e92d3a46509e3fa66ccbba23fb4eeb9b9c90e23bf2849b45de7c
-  data.tar.gz: 3df8118f086fa318d4f3bd8dbb0c1af69ffd28ce021cf61bff428f4c168e3a48f88c5c24b5374edf3c9e09709eb9bb2f96ef170d1b95b62812384a8843613846
+  metadata.gz: 295ea892e8aa73e61eb09cfd8e18663e01a2a6cd21cdf3bed5780c5de9a6a760730b61a18d7d286edf1bad39139461df9047f448f7c7492322a5ceb61f7a8eb0
+  data.tar.gz: 2a73a1f8c4308bcf701c915d849617eabc1011bed490fca7006da9e0ae4daca77b70d317b254304478612f02c8da53e61d3856e63354459daf4e7ed12d574f58

data/lib/chef/provisioning/vsphere_driver/clone_spec_builder.rb

@@ -0,0 +1,190 @@
+module ChefProvisioningVsphere
+  class CloneSpecBuilder
+    def initialize(vsphere_helper, action_handler)
+      @vsphere_helper = vsphere_helper
+      @action_handler = action_handler
+    end
+
+    attr_reader :vsphere_helper
+    attr_reader :action_handler
+
+    def build(vm_template, vm_name, options)
+      clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(
+        location: relocate_spec_for(vm_template, options),
+        powerOn: false,
+        template: false,
+        config: RbVmomi::VIM.VirtualMachineConfigSpec(
+          :cpuHotAddEnabled => true,
+          :memoryHotAddEnabled => true,
+          :cpuHotRemoveEnabled => true,
+          :deviceChange => Array.new)
+      )
+
+      unless options[:annotation].to_s.nil?
+        clone_spec.config.annotation = options[:annotation]
+      end
+
+      unless options[:num_cpus].to_s.nil?
+        clone_spec.config.numCPUs = options[:num_cpus]
+      end
+
+      unless options[:memory_mb].to_s.nil?
+        clone_spec.config.memoryMB = options[:memory_mb]
+      end
+
+      unless options[:network_name].nil?
+        deviceAdditions, changes = vsphere_helper.network_device_changes(
+          action_handler,
+          vm_template,
+          options
+        )
+        clone_spec.config.deviceChange = changes
+      end
+
+      clone_spec.customization = customization_options_from(
+        vm_template,
+        vm_name,
+        options
+      )
+
+      clone_spec
+    end
+
+    def relocate_spec_for(vm_template, options)
+      if options.has_key?(:host)
+        host = vsphere_helper.find_host(options[:host])
+        rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(host: host) 
+      else
+        pool = vm_template.resourcePool
+        vpool = vsphere_helper.find_pool(options[:resource_pool])
+        rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(pool: vpool || pool)
+        raise "either :host or :resource_pool must be specified \
+          when cloning from a VM Template" if pool.nil?
+      end
+
+      if options[:use_linked_clone]
+        vsphere_helper.create_delta_disk(vm_template)
+        rspec.diskMoveType = :moveChildMostDiskBacking
+      end
+
+      unless options[:datastore].to_s.empty?
+        rspec.datastore = vsphere_helper.find_datastore(options[:datastore])
+      end
+
+      rspec
+    end
+
+    def customization_options_from(vm_template, vm_name, options)
+      if options.has_key?(:customization_spec)
+        if(options[:customization_spec].is_a?(Hash))
+          cust_options = options[:customization_spec]
+          ip_settings = cust_options[:ipsettings]
+          cust_domain = cust_options[:domain]
+
+          raise ArgumentError, 'domain is required' unless cust_domain
+          cust_ip_settings = nil
+          if ip_settings && ip_settings.key?(:ip)
+            unless cust_options[:ipsettings].key?(:subnetMask)
+              raise ArgumentError, 'subnetMask is required for static ip'
+            end
+            cust_ip_settings = RbVmomi::VIM::CustomizationIPSettings.new(
+              ip_settings)
+            action_handler.report_progress "customizing #{vm_name} \
+              with static IP #{ip_settings[:ip]}"
+            cust_ip_settings.ip = RbVmomi::VIM::CustomizationFixedIp(
+              :ipAddress => ip_settings[:ip])
+          end
+          if cust_ip_settings.nil?
+            cust_ip_settings= RbVmomi::VIM::CustomizationIPSettings.new(
+              :ip => RbVmomi::VIM::CustomizationDhcpIpGenerator.new())
+            cust_ip_settings.dnsServerList = ip_settings[:dnsServerList]
+            action_handler.report_progress "customizing #{vm_name} with /
+              dynamic IP and DNS: #{ip_settings[:dnsServerList]}"
+          end
+
+          cust_ip_settings.dnsDomain = cust_domain
+          global_ip_settings = RbVmomi::VIM::CustomizationGlobalIPSettings.new
+          global_ip_settings.dnsServerList = cust_ip_settings.dnsServerList
+          global_ip_settings.dnsSuffixList = [cust_domain]
+          cust_hostname = hostname_from(cust_options, vm_name)
+          cust_hwclockutc = cust_options[:hw_clock_utc]
+          cust_timezone = cust_options[:time_zone]
+
+          if vm_template.config.guestId.start_with?('win')
+            cust_prep = windows_prep_for(options, vm_name)
+          else
+            cust_prep = RbVmomi::VIM::CustomizationLinuxPrep.new(
+              :domain => cust_domain,
+              :hostName => cust_hostname,
+              :hwClockUTC => cust_hwclockutc,
+              :timeZone => cust_timezone
+            )
+          end
+          cust_adapter_mapping = [
+            RbVmomi::VIM::CustomizationAdapterMapping.new(
+              :adapter => cust_ip_settings)
+          ]
+          RbVmomi::VIM::CustomizationSpec.new(
+            :identity => cust_prep,
+            :globalIPSettings => global_ip_settings,
+            :nicSettingMap => cust_adapter_mapping
+          )
+        else
+          vsphere_helper.find_customization_spec(cust_options)
+        end
+      end
+    end
+
+    def hostname_from(options, vm_name)
+      if options.key?(:hostname)
+        RbVmomi::VIM::CustomizationFixedName.new(:name => options[:hostname])
+      else
+        RbVmomi::VIM::CustomizationFixedName.new(:name => vm_name)
+      end
+    end
+
+    def windows_prep_for(options, vm_name)
+      cust_options = options[:customization_spec]
+      cust_runonce = RbVmomi::VIM::CustomizationGuiRunOnce.new(
+        :commandList => [
+          'winrm set winrm/config/client/auth @{Basic="true"}',
+          'winrm set winrm/config/service/auth @{Basic="true"}',
+          'winrm set winrm/config/service @{AllowUnencrypted="true"}',
+          'shutdown -l'])
+
+      cust_login_password = RbVmomi::VIM::CustomizationPassword(
+        :plainText => true,
+        :value => options[:ssh][:password])
+      if cust_options.has_key?(:domain) and cust_options[:domain] != 'local'
+        cust_domain_password = RbVmomi::VIM::CustomizationPassword(
+          :plainText => true,
+          :value => ENV['domainAdminPassword'] || cust_options[:domainAdminPassword])
+        cust_id = RbVmomi::VIM::CustomizationIdentification.new(
+          :joinDomain => cust_options[:domain],
+          :domainAdmin => cust_options[:domainAdmin],
+          :domainAdminPassword => cust_domain_password)
+        #puts "my env passwd is: #{ENV['domainAdminPassword']}"
+        action_handler.report_progress "joining domain #{cust_options[:domain]} /
+          with user: #{cust_options[:domainAdmin]}"
+      else
+        cust_id = RbVmomi::VIM::CustomizationIdentification.new(
+          :joinWorkgroup => 'WORKGROUP')
+      end
+      cust_gui_unattended = RbVmomi::VIM::CustomizationGuiUnattended.new(
+        :autoLogon => true,
+        :autoLogonCount => 1,
+        :password => cust_login_password,
+        :timeZone => cust_options[:win_time_zone])
+      cust_userdata = RbVmomi::VIM::CustomizationUserData.new(
+        :computerName => hostname_from(cust_options, vm_name),
+        :fullName => cust_options[:org_name],
+        :orgName => cust_options[:org_name],
+        :productId => cust_options[:product_id])
+      RbVmomi::VIM::CustomizationSysprep.new(
+        :guiRunOnce => cust_runonce,
+        :identification => cust_id,
+        :guiUnattended => cust_gui_unattended,
+        :userData => cust_userdata)
+    end
+  end
+end

data/lib/chef/provisioning/vsphere_driver/driver.rb

@@ -3,6 +3,7 @@ require 'cheffish/merged_config'
 require 'chef/provisioning/driver'
 require 'chef/provisioning/machine/windows_machine'
 require 'chef/provisioning/machine/unix_machine'
+require 'chef/provisioning/vsphere_driver/clone_spec_builder'
 require 'chef/provisioning/vsphere_driver/version'
 require 'chef/provisioning/vsphere_driver/vsphere_helpers'
 require 'chef/provisioning/vsphere_driver/vsphere_url'
@@ -11,7 +12,6 @@ module ChefProvisioningVsphere
   # Provisions machines in vSphere.
   class VsphereDriver < Chef::Provisioning::Driver
     include Chef::Mixin::ShellOut
-    include ChefProvisioningVsphere::Helpers
 
     def self.from_url(driver_url, config)
       VsphereDriver.new(driver_url, config)
@@ -163,7 +163,7 @@ module ChefProvisioningVsphere
     end
 
     def find_or_create_vm(bootstrap_options, machine_spec, action_handler)
-      vm = find_vm(
+      vm = vsphere_helper.find_vm(
         bootstrap_options[:vm_folder],
         machine_spec.name
       )
@@ -231,7 +231,7 @@ module ChefProvisioningVsphere
       end
       return if networks.nil? || networks.count < 2
 
-      new_nics = add_extra_nic(
+      new_nics = vsphere_helper.add_extra_nic(
         action_handler,
         vm_template_for(bootstrap_options),
         bootstrap_options,
@@ -313,7 +313,7 @@ module ChefProvisioningVsphere
           msg << vm.guest.toolsRunningStatus
           msg << '. powering up server...'
           action_handler.report_progress(msg.join)
-          start_vm(vm)
+          vsphere_helper.start_vm(vm)
         else
           restart_server(action_handler, machine_spec, machine_options)
         end
@@ -395,7 +395,7 @@ module ChefProvisioningVsphere
       vm = vm_for(machine_spec)
       if vm
         action_handler.perform_action "Shutdown guest OS and power off VM [#{vm.parent.name}/#{vm.name}]" do
-          stop_vm(vm)
+          vsphere_helper.stop_vm(vm)
         end
       end
     end
@@ -405,14 +405,14 @@ module ChefProvisioningVsphere
       vm = vm_for(machine_spec)
       if vm
         action_handler.perform_action "Power on VM [#{vm.parent.name}/#{vm.name}]" do
-          start_vm(vm, machine_options[:bootstrap_options][:ssh][:port])
+          vsphere_helper.start_vm(vm, machine_options[:bootstrap_options][:ssh][:port])
         end
       end
       vm
     end
 
     def restart_server(action_handler, machine_spec, machine_options)
-      action_handler.perform_action "restart machine #{machine_spec.name} (#{vm.config.instanceUuid} on #{driver_url})" do
+      action_handler.perform_action "restart machine #{machine_spec.name} (#{driver_url})" do
         stop_machine(action_handler, machine_spec, machine_options)
         start_machine(action_handler, machine_spec, machine_options)
         machine_spec.location['started_at'] = Time.now.utc.to_s
@@ -484,25 +484,52 @@ module ChefProvisioningVsphere
 
     def vm_for(machine_spec)
       if machine_spec.location
-        find_vm_by_id(machine_spec.location['server_id'])
+        vsphere_helper.find_vm_by_id(machine_spec.location['server_id'])
       else
         nil
       end
     end
 
     def clone_vm(action_handler, bootstrap_options, machine_name)
-      do_vm_clone(
-        action_handler,
-        vm_template_for(bootstrap_options),
-        machine_name,
-        bootstrap_options
+      vm_template = vm_template_for(bootstrap_options)
+
+      spec_builder = CloneSpecBuilder.new(vsphere_helper, action_handler)
+      clone_spec = spec_builder.build(vm_template, machine_name, bootstrap_options)
+      
+      vm_folder = vsphere_helper.find_folder(bootstrap_options[:vm_folder])
+      vm_template.CloneVM_Task(
+        name: machine_name,
+        folder: vm_folder,
+        spec: clone_spec
+      ).wait_for_completion
+
+      vm = vsphere_helper.find_vm(vm_folder, machine_name)
+
+      if bootstrap_options[:additional_disk_size_gb].to_i > 0
+        task = vm.ReconfigVM_Task(
+          spec: RbVmomi::VIM.VirtualMachineConfigSpec(
+            deviceChange: [
+              vsphere_helper.virtual_disk_for(vm, bootstrap_options)
+            ]
+          )
+        )
+        task.wait_for_completion
+      end
+
+      vm
+    end
+
+    def vsphere_helper
+      @vsphere_helper ||= VsphereHelper.new(
+        connect_options, 
+        config[:machine_options][:bootstrap_options][:datacenter]
       )
     end
 
     def vm_template_for(bootstrap_options)
       template_folder = bootstrap_options[:template_folder]
       template_name   = bootstrap_options[:template_name]
-      find_vm(template_folder, template_name) ||
+      vsphere_helper.find_vm(template_folder, template_name) ||
         raise("vSphere VM Template not found [#{template_folder}/#{template_name}]")
     end
 

data/lib/chef/provisioning/vsphere_driver/version.rb

@@ -1,3 +1,3 @@
 module ChefProvisioningVsphere
-  VERSION = '0.5.6'
+  VERSION = '0.5.7.dev'
 end

data/lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb

@@ -1,16 +1,24 @@
 require 'rbvmomi'
 
 module ChefProvisioningVsphere
-  module Helpers
+  class VsphereHelper
 
     if !$guest_op_managers
       $guest_op_managers = {}
     end
 
-    def vim(options = connect_options)
+    def initialize(connect_options, datacenter_name)
+      @connect_options = connect_options
+      @datacenter_name = datacenter_name
+    end
+
+    attr_reader :connect_options
+    attr_reader :datacenter_name
+
+    def vim
       if @current_connection.nil? or @current_connection.serviceContent.sessionManager.currentSession.nil?
-        puts "establishing connection to #{options[:host]}"
-        @current_connection = RbVmomi::VIM.connect options
+        puts "establishing connection to #{connect_options[:host]}"
+        @current_connection = RbVmomi::VIM.connect connect_options
         str_conn = @current_connection.pretty_inspect # a string in the format of VIM(host ip)
         
         # we are caching guest operation managers in a global variable...terrible i know
@@ -31,8 +39,8 @@ module ChefProvisioningVsphere
       folder.find(vm_name, RbVmomi::VIM::VirtualMachine)
     end
 
-    def find_vm_by_id(uuid, connection = vim)
-      vm = connection.searchIndex.FindByUuid(
+    def find_vm_by_id(uuid)
+      vm = vim.searchIndex.FindByUuid(
         uuid: uuid,
         vmSearch: true,
         instanceUuid: true
@@ -108,9 +116,8 @@ module ChefProvisioningVsphere
     end
 
     def datacenter
-      dc_name = config[:machine_options][:bootstrap_options][:datacenter]
-      @datacenter ||= vim.serviceInstance.find_datacenter(dc_name) ||
-        raise("vSphere Datacenter not found [#{dc_name}]")
+      @datacenter ||= vim.serviceInstance.find_datacenter(datacenter_name) ||
+        raise("vSphere Datacenter not found [#{datacenter_name}]")
     end
 
     def network_adapter_for(operation, network_name, network_label, device_key, backing_info)
@@ -206,28 +213,6 @@ module ChefProvisioningVsphere
       end
     end
 
-    def relocate_spec_for(vm_template, options)
-      if options.has_key?(:host)
-        host = find_host(options[:host])
-        rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(host: host) 
-      else
-        pool = options[:resource_pool] ? find_pool(options[:resource_pool]) : vm_template.resourcePool
-        rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(pool: pool)
-        raise 'either :host or :resource_pool must be specified when cloning from a VM Template' if pool.nil?
-      end
-
-      if options.has_key?(:use_linked_clone)
-        create_delta_disk(vm_template)
-        rspec.diskMoveType = :moveChildMostDiskBacking
-      end
-
-      unless options[:datastore].to_s.empty?
-        rspec.datastore = find_datastore(options[:datastore])
-      end
-
-      rspec
-    end
-
     def create_delta_disk(vm_template)
       disks = vm_template.config.hardware.device.grep(RbVmomi::VIM::VirtualDisk)
       disks.select { |disk| disk.backing.parent == nil }.each do |disk|
@@ -326,110 +311,6 @@ module ChefProvisioningVsphere
       datacenter.datastore.find { |f| f.info.name == datastore_name } or raise "no such datastore #{datastore_name}"
     end
 
-    def customization_options_from(action_handler, vm_template, vm_name, options)
-      if options.has_key?(:customization_spec)
-        if(options[:customization_spec].is_a?(Hash))
-          cust_options = options[:customization_spec]
-          ip_settings = cust_options[:ipsettings]
-          cust_domain = cust_options[:domain]
-
-          raise ArgumentError, 'domain is required' unless cust_domain
-          cust_ip_settings = nil
-          if ip_settings && ip_settings.key?(:ip)
-            unless cust_options[:ipsettings].key?(:subnetMask)
-              raise ArgumentError, 'subnetMask is required for static ip'
-            end
-            cust_ip_settings = RbVmomi::VIM::CustomizationIPSettings.new(ip_settings)
-            action_handler.report_progress "customizing #{vm_name} with static IP #{ip_settings[:ip]}"
-            cust_ip_settings.ip = RbVmomi::VIM::CustomizationFixedIp(:ipAddress => ip_settings[:ip])
-          end
-          if cust_ip_settings.nil?
-            cust_ip_settings= RbVmomi::VIM::CustomizationIPSettings.new(:ip => RbVmomi::VIM::CustomizationDhcpIpGenerator.new())
-            cust_ip_settings.dnsServerList = ip_settings[:dnsServerList]
-            action_handler.report_progress "customizing #{vm_name} with dynamic IP and DNS: #{ip_settings[:dnsServerList]}"
-          end
-
-          cust_ip_settings.dnsDomain = cust_domain
-          cust_global_ip_settings = RbVmomi::VIM::CustomizationGlobalIPSettings.new
-          cust_global_ip_settings.dnsServerList = cust_ip_settings.dnsServerList
-          cust_global_ip_settings.dnsSuffixList = [cust_domain]
-          cust_hostname = hostname_from(cust_options, vm_name)
-          cust_hwclockutc = cust_options[:hw_clock_utc]
-          cust_timezone = cust_options[:time_zone]
-
-          if vm_template.config.guestId.start_with?('win')
-            cust_prep = windows_prep_for(action_handler, options, vm_name)
-          else
-            cust_prep = RbVmomi::VIM::CustomizationLinuxPrep.new(
-              :domain => cust_domain,
-              :hostName => cust_hostname,
-              :hwClockUTC => cust_hwclockutc,
-              :timeZone => cust_timezone
-            )
-          end
-          cust_adapter_mapping = [RbVmomi::VIM::CustomizationAdapterMapping.new(:adapter => cust_ip_settings)]
-          RbVmomi::VIM::CustomizationSpec.new(
-            :identity => cust_prep,
-            :globalIPSettings => cust_global_ip_settings,
-            :nicSettingMap => cust_adapter_mapping
-          )
-        else
-          find_customization_spec(cust_options)
-        end
-      end
-    end
-
-    def windows_prep_for(action_handler, options, vm_name)
-      cust_options = options[:customization_spec]
-      cust_runonce = RbVmomi::VIM::CustomizationGuiRunOnce.new(
-        :commandList => [
-          'winrm set winrm/config/client/auth @{Basic="true"}',
-          'winrm set winrm/config/service/auth @{Basic="true"}',
-          'winrm set winrm/config/service @{AllowUnencrypted="true"}',
-          'shutdown -l'])
-
-      cust_login_password = RbVmomi::VIM::CustomizationPassword(
-        :plainText => true,
-        :value => options[:ssh][:password])
-      if cust_options.has_key?(:domain) and cust_options[:domain] != 'local'
-        cust_domain_password = RbVmomi::VIM::CustomizationPassword(
-          :plainText => true,
-          :value => ENV['domainAdminPassword'] || cust_options[:domainAdminPassword])
-        cust_id = RbVmomi::VIM::CustomizationIdentification.new(
-          :joinDomain => cust_options[:domain],
-          :domainAdmin => cust_options[:domainAdmin],
-          :domainAdminPassword => cust_domain_password)
-        #puts "my env passwd is: #{ENV['domainAdminPassword']}"
-        action_handler.report_progress "joining domain #{cust_options[:domain]} with user: #{cust_options[:domainAdmin]}"
-      else
-        cust_id = RbVmomi::VIM::CustomizationIdentification.new(
-          :joinWorkgroup => 'WORKGROUP')
-      end
-      cust_gui_unattended = RbVmomi::VIM::CustomizationGuiUnattended.new(
-        :autoLogon => true,
-        :autoLogonCount => 1,
-        :password => cust_login_password,
-        :timeZone => cust_options[:win_time_zone])
-      cust_userdata = RbVmomi::VIM::CustomizationUserData.new(
-        :computerName => hostname_from(cust_options, vm_name),
-        :fullName => cust_options[:org_name],
-        :orgName => cust_options[:org_name],
-        :productId => cust_options[:product_id])
-      RbVmomi::VIM::CustomizationSysprep.new(
-        :guiRunOnce => cust_runonce,
-        :identification => cust_id,
-        :guiUnattended => cust_gui_unattended,
-        :userData => cust_userdata)
-    end
-
-    def hostname_from(options, vm_name)
-      if options.key?(:hostname)
-        RbVmomi::VIM::CustomizationFixedName.new(:name => options[:hostname])
-      else
-        RbVmomi::VIM::CustomizationFixedName.new(:name => vm_name)
-      end
-    end
-
     def find_entity(name, parent_folder, &block)
       parts = name.split('/').reject(&:empty?)
       parts.each do |item|
@@ -456,8 +337,8 @@ module ChefProvisioningVsphere
 
       raise "vSphere Host not found [#{host_name}]" if host.nil?
 
-      if !host.is_a?(RbVmomi::VIM::HostSystem) && host.respond_to?(:host)
-        host = host.host
+      if host.is_a?(RbVmomi::VIM::ComputeResource)
+        host = host.first
       end
       host
     end

data/spec/integration_tests/vsphere_driver_spec.rb

@@ -34,8 +34,6 @@ require 'chef/provisioning/machine_spec'
   # }
 
 describe 'vsphere_driver' do
-  include ChefProvisioningVsphere::Helpers
-
   before :all do
     @vm_name = "cmvd-test-#{SecureRandom.hex}"
     @metal_config = eval File.read(File.expand_path('../config.rb', __FILE__))
@@ -49,8 +47,11 @@ describe 'vsphere_driver' do
       @metal_config[:machine_options][:convergence_options] = {:chef_server => chef_server}
       machine = @driver.ready_machine(action_handler, @machine_spec, @metal_config[:machine_options])
       @server_id = @machine_spec.location['server_id']
-      @connection = vim(@metal_config[:driver_options])
-      @vm = find_vm_by_id(@server_id, @connection)
+      @vsphere_helper = ChefProvisioningVsphere::VsphereHelper.new(
+        @metal_config[:driver_options],
+        @metal_config[:machine_options][:bootstrap_options][:datacenter]
+      )
+      @vm = @vsphere_helper.find_vm_by_id(@server_id)
     end
   end
 
@@ -101,7 +102,7 @@ describe 'vsphere_driver' do
       end
     end
     it 'is in the correct datacenter' do
-      expect(@connection.serviceInstance.find_datacenter(@metal_config[:machine_options][:bootstrap_options][:datacenter]).find_vm("#{@vm.parent.name}/#{@vm_name}")).not_to eq(nil)
+      expect(@vsphere_helper.vim.serviceInstance.find_datacenter(@metal_config[:machine_options][:bootstrap_options][:datacenter]).find_vm("#{@vm.parent.name}/#{@vm_name}")).not_to eq(nil)
     end
     it 'has an added disk of the correct size' do
       disk_count = @vm.disks.count
@@ -146,7 +147,7 @@ describe 'vsphere_driver' do
           @metal_config[:machine_options]
         )
       end
-      vm = find_vm_by_id(@server_id, @connection)
+      vm = @vsphere_helper.find_vm_by_id(@server_id)
       expect(vm).to eq(nil)
     end
   end

data/spec/unit_tests/clone_spec_builder_spec.rb

@@ -0,0 +1,34 @@
+require 'chef/provisioning/vsphere_driver'
+
+require_relative 'support/vsphere_helper_stub'
+
+describe ChefProvisioningVsphere::CloneSpecBuilder do
+  let(:options) { { host: 'host' } }
+  let(:vm_template) { double('template', resourcePool: 'pool') }
+
+  before { allow(vm_template).to receive_message_chain(:config, :guestId) }
+
+  subject do
+    builder = ChefProvisioningVsphere::CloneSpecBuilder.new(
+      ChefProvisioningVsphereStubs::VsphereHelperStub.new,
+      Chef::Provisioning::ActionHandler.new
+    )
+    builder.build(vm_template, 'machine_name', options)
+  end
+
+  context 'using linked clones' do
+    before { options[:use_linked_clone] = true }
+
+    it 'sets the disk move type of the relocation spec' do
+      expect(subject.location.diskMoveType).to be :moveChildMostDiskBacking
+    end
+  end
+
+  context 'not using linked clones' do
+    before { options[:use_linked_clone] = false }
+
+    it 'sets the disk move type of the relocation spec' do
+      expect(subject.location.diskMoveType).to be nil
+    end
+  end
+end

data/spec/unit_tests/support/vsphere_helper_stub.rb

@@ -0,0 +1,32 @@
+module ChefProvisioningVsphereStubs
+  class VsphereHelperStub < ChefProvisioningVsphere::VsphereHelper
+    def initialize
+    end
+
+    def network_device_changes(action_handler, vm_template, options)
+      [
+        [RbVmomi::VIM::VirtualDeviceConfigSpec.new],
+        [RbVmomi::VIM::VirtualDeviceConfigSpec.new]
+      ]
+    end
+
+    def find_host(host_name)
+      RbVmomi::VIM::HostSystem.new(nil, nil)
+    end
+
+    def find_pool(pool_name)
+      RbVmomi::VIM::ResourcePool.new(nil, nil)
+    end
+
+    def find_datastore(datastore_name)
+      RbVmomi::VIM::Datastore.new
+    end
+
+    def find_customization_spec(options)
+      RbVmomi::VIM::CustomizationSpec.new
+    end
+
+    def create_delta_disk(vm_template)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7.dev
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
@@ -103,6 +103,7 @@ files:
 - contribution-notice
 - lib/chef/provisioning/driver_init/vsphere.rb
 - lib/chef/provisioning/vsphere_driver.rb
+- lib/chef/provisioning/vsphere_driver/clone_spec_builder.rb
 - lib/chef/provisioning/vsphere_driver/driver.rb
 - lib/chef/provisioning/vsphere_driver/version.rb
 - lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb
@@ -112,6 +113,8 @@ files:
 - spec/integration_tests/vsphere_driver_spec.rb
 - spec/unit_tests/VsphereDriver_spec.rb
 - spec/unit_tests/VsphereUrl_spec.rb
+- spec/unit_tests/clone_spec_builder_spec.rb
+- spec/unit_tests/support/vsphere_helper_stub.rb
 homepage: https://github.com/tier3/chef-provisioning-vsphere
 licenses:
 - MIT
@@ -127,9 +130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.4
@@ -141,4 +144,6 @@ test_files:
 - spec/integration_tests/vsphere_driver_spec.rb
 - spec/unit_tests/VsphereDriver_spec.rb
 - spec/unit_tests/VsphereUrl_spec.rb
+- spec/unit_tests/clone_spec_builder_spec.rb
+- spec/unit_tests/support/vsphere_helper_stub.rb
 has_rdoc: