chef-provisioning-vsphere 0.5.7.dev5 → 0.5.7.dev6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71c99341e65d9084e907c86d3cc7b7bda5084a38
-  data.tar.gz: 41a2f45c4acfa77c40d2e9581b887e2d776d62bf
+  metadata.gz: 9a2f55b3a6433abfdd06aa270db00b1bed0cb8ab
+  data.tar.gz: 74c8800daf24128394246648b0e02540ac0485e8
 SHA512:
-  metadata.gz: cf050ba6da9b367ec9930a4202832e296529b033f23547abfe56417206909edfeb425ab352ba3f17918f5b0e20d30721a6a2b5b0e73b061fcf1ba5d3d75b9e6a
-  data.tar.gz: 6369e85397d54ffa852486b467c324ee424ec3b84ad88e02d35c12b754c3eb64f06771732502d556aa4f36e1c4d4ac3969743dbfe260c6eadcbbd39a750b0b17
+  metadata.gz: 56b566ca067ed38e6d7b639d6a687468b1189be2693bcd608cd85753d98cba8361009f00e145bf2ee2f9dffc8c766898767787f6f1b9177b73271a5dbc3359ce
+  data.tar.gz: a01d8b591d62cd589569f868e3aa606c1f133f6a099caaab60534628848a56168014d3cd0a95a6722c86d61d8594ca743fe2ff0add2919ca5706ddb99da1cbcf

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

@@ -51,23 +51,30 @@ module ChefProvisioningVsphere
     end
 
     def relocate_spec_for(vm_template, options)
+      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec
+      host = nil
+
       if options.has_key?(:host)
         host = vsphere_helper.find_host(options[:host])
-        rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(host: host) 
-      else
-        if options[:resource_pool]
-          pool = vsphere_helper.find_pool(options[:resource_pool])
-        else
-          pool = vm_template.resourcePool
-        end
-        rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(pool: pool)
-        raise "either :host or :resource_pool must be specified \
-          when cloning from a VM Template" if pool.nil?
+        rspec.host = host
       end
 
+      if options[:resource_pool]
+        rspec.pool = vsphere_helper.find_pool(options[:resource_pool])
+      elsif vm_template.config.template && !host.nil?
+        rspec.pool = host.parent.resourcePool # assign to the "invisible" pool root
+      elsif vm_template.config.template
+        raise 'either :host or :resource_pool must be specified when cloning from a VM Template'
+      end
+
+
       if options[:use_linked_clone]
-        vsphere_helper.create_delta_disk(vm_template)
-        rspec.diskMoveType = :moveChildMostDiskBacking
+        if vm_template.config.template
+          Chef::Log.warn("Using a VM Template, ignoring use_linked_clone.")
+        else
+          vsphere_helper.create_delta_disk(vm_template)
+          rspec.diskMoveType = :moveChildMostDiskBacking
+        end
       end
 
       unless options[:datastore].to_s.empty?

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

@@ -495,7 +495,7 @@ module ChefProvisioningVsphere
 
       spec_builder = CloneSpecBuilder.new(vsphere_helper, action_handler)
       clone_spec = spec_builder.build(vm_template, machine_name, bootstrap_options)
-      Chef::Log.debug("Clone spec: #{clone_spec.pretty_inspect}")      
+      Chef::Log.debug("Clone spec: #{clone_spec.pretty_inspect}")
 
       vm_folder = vsphere_helper.find_folder(bootstrap_options[:vm_folder])
       vm_template.CloneVM_Task(

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

@@ -1,3 +1,3 @@
 module ChefProvisioningVsphere
-  VERSION = '0.5.7.dev5'
+  VERSION = '0.5.7.dev6'
 end

data/spec/unit_tests/clone_spec_builder_spec.rb

@@ -3,10 +3,14 @@ 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') }
+  let(:options) { Hash.new }
+  let(:vm_template) { double('template') }
 
-  before { allow(vm_template).to receive_message_chain(:config, :guestId) }
+  before do
+    allow(vm_template).to receive_message_chain(:config, :guestId)
+    allow(vm_template).to receive_message_chain(:config, :template)
+      .and_return(false)
+  end
 
   subject do
     builder = ChefProvisioningVsphere::CloneSpecBuilder.new(
@@ -24,11 +28,75 @@ describe ChefProvisioningVsphere::CloneSpecBuilder do
     end
   end
 
+  context 'using linked clone on a template source' do
+    before do
+      options[:use_linked_clone] = true
+      options[:host] = 'host'
+      allow(vm_template).to receive_message_chain(:config, :template)
+        .and_return(true)
+    end
+
+    it 'does not set the disk move type of the relocation spec' do
+      expect(subject.location.diskMoveType).to be nil
+    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
+    it 'does not set the disk move type of the relocation spec' do
       expect(subject.location.diskMoveType).to be nil
     end
   end
+
+  context 'specifying a host' do
+    before { options[:host] = 'host' }
+
+    it 'sets the host' do
+      expect(subject.location.host).to_not be nil
+    end
+  end
+
+  context 'not specifying a host' do
+    it 'does not set the host' do
+      expect(subject.location.host).to be nil
+    end
+  end
+
+  context 'specifying a pool' do
+    before { options[:resource_pool] = 'pool' }
+
+    it 'sets the pool' do
+      expect(subject.location.pool).to_not be nil
+    end
+  end
+
+  context 'not specifying a pool' do
+    it 'does not set the pool' do
+      expect(subject.location.pool).to be nil
+    end
+  end
+
+  context 'not specifying a pool but specifying a host on a template' do
+    before do 
+      options[:host] = 'host'
+      allow(vm_template).to receive_message_chain(:config, :template)
+        .and_return(true)
+    end
+
+    it 'sets the pool to the hosts parent root pool' do
+      expect(subject.location.pool).to be subject.location.host.parent.resourcePool
+    end
+  end
+
+  context 'not specifying a pool or host when cloning from a template' do
+    before do
+      allow(vm_template).to receive_message_chain(:config, :template)
+        .and_return(true)
+    end
+
+    it 'raises an error' do
+      expect { subject.to raise_error }
+    end
+  end
 end

data/spec/unit_tests/support/vsphere_helper_stub.rb

@@ -11,7 +11,7 @@ module ChefProvisioningVsphereStubs
     end
 
     def find_host(host_name)
-      RbVmomi::VIM::HostSystem.new(nil, nil)
+      RbVmomi::VIM::HostSystem.new
     end
 
     def find_pool(pool_name)
@@ -30,3 +30,23 @@ module ChefProvisioningVsphereStubs
     end
   end
 end
+
+module RbVmomi
+  class VIM::HostSystem
+    attr_reader :parent
+
+    def parent
+      @parent ||= RbVmomi::VIM::ComputeResource.new
+    end
+  end
+end
+
+module RbVmomi
+  class VIM::ComputeResource
+    attr_reader :resourcePool
+
+    def resourcePool
+      @resourcePool ||= RbVmomi::VIM::ResourcePool.new(nil, nil)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.5.7.dev5
+  version: 0.5.7.dev6
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi