clc-chef-metal-vsphere 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 626716097bd3a3074cab890277c2bbfc9726b451
-  data.tar.gz: 405e2fe7989615c898dec0e0a4448fe5b82722a5
+  metadata.gz: 30ca8337aad8fb990cd2be047ae531f283da2a5a
+  data.tar.gz: e9d7037e74152546784045c3821bd96dd342008f
 SHA512:
-  metadata.gz: e92adb82d2585a7541efaef326d9fb08c3652e78393653ce55c3bad915a0768c7366bc2468962d1b180084c82a33a769c0426acd8ed83eb6fc7ec18811b90ee7
-  data.tar.gz: f502e75e457ebca62d585e971bf3dd69afa1f2c360c2969c9f72e7e7b3c17d85c80b45d993a652ffe9956f8e2968c4abaa99859b6fe2bdf1e4dce81e6dc2fd94
+  metadata.gz: dc1fdc88af6f42f22d995b43e6bec397f9b1119fb01c054329b07c18101c1c1f09972a9e6ef14b51aad39da431bb50624de1063e8ecc3e1b591cdd70751ab7f1
+  data.tar.gz: 22327524c3ca5b889de9c4bfca907a9479445b384c67d5981a27989a599268223b84eeab3c220dabc1b5ad0326883f232f77611cc375a82dcd23b5e8ab1bf522

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -94,9 +94,14 @@ module ChefMetalVsphere
 
     def do_vm_clone(dc_name, vm_template, vm_name, options)
       datacenter = dc(dc_name)
-      pool = options[:resource_pool] ? find_pool(datacenter, options[:resource_pool]) : vm_template.resourcePool
-      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(pool: pool)
-      raise ':resource_pool must be specified when cloning from a VM Template' if pool.nil?
+      if options.has_key?(:host)
+        host = find_host(datacenter, options[:host])
+        rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(host: host) 
+      else
+        pool = options[:resource_pool] ? find_pool(datacenter, 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
 
       unless options[:datastore].to_s.empty?
         rspec.datastore = find_datastore(datacenter, options[:datastore])
@@ -216,6 +221,29 @@ module ChefMetalVsphere
         baseEntity.find { |f| f.info.name == datastore_name } or raise "no such datastore #{datastore_name}"    
     end
 
+    def find_host(dc, host_name)
+      baseEntity = dc.hostFolder
+      entityArray = host_name.split('/')
+      entityArray.each do |entityArrItem|
+        if entityArrItem != ''
+          if baseEntity.is_a? RbVmomi::VIM::Folder
+            baseEntity = baseEntity.childEntity.find { |f| f.name == entityArrItem } or nil
+          elsif baseEntity.is_a? RbVmomi::VIM::ClusterComputeResource or baseEntity.is_a? RbVmomi::VIM::ComputeResource
+            baseEntity = baseEntity.host.find { |f| f.name == entityArrItem } or nil
+          elsif baseEntity.is_a? RbVmomi::VIM::HostSystem
+            baseEntity = baseEntity.host.find { |f| f.name == entityArrItem } or nil
+          else
+            baseEntity = nil
+          end
+        end
+      end
+
+      raise "vSphere Host not found [#{host_name}]" if baseEntity.nil?
+
+      baseEntity = baseEntity.host if not baseEntity.is_a?(RbVmomi::VIM::HostSystem) and baseEntity.respond_to?(:host)
+      baseEntity
+    end
+
     def find_pool(dc, pool_name)
       baseEntity = dc.hostFolder
       entityArray = pool_name.split('/')

data/spec/integration_tests/config.rb

@@ -1,7 +1,7 @@
 	{
 	  :driver_options => { 
-	  	:host => '172.21.10.10',
-	  	:user => 'vmapi',
+	  	:host => '172.22.10.11',
+	  	:user => 'qa4t3nvc01\\vmapi',
 	  	:password => 'Pass@word1',
 	  	:insecure => true
 	  },
@@ -9,14 +9,14 @@
 			:start_timeout => 600, 
             :create_timeout => 600, 	  	
             :bootstrap_options => {
-	  		:datacenter => 'QA1',
+	  		:datacenter => 'QA3HPC',
 	  		:template_name => 'UBUNTU-12-64-TEMPLATE',
 	  		:vm_folder => 'DLAB',
-	  		:datastore => 'QA1-2-SFIRE-01',
+	  		:datastore => 'QA3-VMTEMPLATES-HPC-A01',
 	  		:num_cpus => 2,
-	  		:network_name => 'vlan_20_172.21.20',
+	  		:network_name => 'vlan_388_172.22.188',
 	  		:memory_mb => 4096,
-	  		:resource_pool => 'CLSTR02/DLAB',
+	  		:host => 'QA3HPCCL01/qa4t3nesx02.t3n.dom',
 	  		:additional_disk_size_gb => 50,
 		  	:ssh => {
 		  		:user => 'root',
@@ -27,9 +27,9 @@
 		  	:convergence_options => {},
 	        :customization_spec => {
 	          :ipsettings => {
-	            :ip => "172.21.20.197",
+	            :ip => "172.22.188.197",
 	            :subnetMask => '255.255.255.0',
-	            :gateway => ["172.21.20.1"],
+	            :gateway => ["172.22.188.1"],
 	            :dnsServerList => ["172.17.1.26","172.17.1.27"]
 	          },
 	          :domain => 'local'

data/spec/integration_tests/vsphere_driver_spec.rb

@@ -80,10 +80,19 @@ describe "vsphere_driver" do
 			expect(@vm.datastore[0].name).to eq(@metal_config[:machine_options][:bootstrap_options][:datastore])
 		end
 		it "is in the correct resource pool" do
-			expect(@vm.resourcePool.name).to eq(@metal_config[:machine_options][:bootstrap_options][:resource_pool].split('/')[1])
+			if @metal_config[:machine_options][:bootstrap_options].has_key?(:resource_pool)
+				expect(@vm.resourcePool.name).to eq(@metal_config[:machine_options][:bootstrap_options][:resource_pool].split('/')[1])
+			end
+		end
+		it "is in the correct host" do
+			if @metal_config[:machine_options][:bootstrap_options].has_key?(:host)
+				expect(@vm.runtime.host.name).to eq(@metal_config[:machine_options][:bootstrap_options][:host].split('/')[1])
+			end
 		end
 		it "is in the correct cluster" do
-			expect(@vm.resourcePool.owner.name).to eq(@metal_config[:machine_options][:bootstrap_options][:resource_pool].split('/')[0])
+			if @metal_config[:machine_options][:bootstrap_options].has_key?(:resource_pool)
+				expect(@vm.resourcePool.owner.name).to eq(@metal_config[:machine_options][:bootstrap_options][:resource_pool].split('/')[0])
+			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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - CenturyLink Cloud