clc-chef-metal-vsphere 0.3.21 → 0.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d16dbc6a25eb57abb89031a4454b2973333cb83e
-  data.tar.gz: 00eeaafca401e0718c7b37701652d3ed55159967
+  metadata.gz: 08c53e98dafb6ce8c5371123ad27bd2d2b729875
+  data.tar.gz: abfe98c1921d109da27ffdadd3eb903d3c4737dd
 SHA512:
-  metadata.gz: 2a2b0e545aca1dc66b78b5d63fc0e8a5244a973f42bcd359cc7a016df2b210f08833767b1ea8800fbde7342f4b77bc03e783d7cbe5abceac94e8520ec91374a9
-  data.tar.gz: d5d2f123bfd12d4b9c5eeab7473a9add9bf2d41515e2c8eae5668ca0a3aa729803a44a15c3ed5a1909b9c7d75f82127eaf3c25b1cd00801811627dab18035ebe
+  metadata.gz: 67119cb4e94ec7424dca182d2911b9631082112a7bdd9d766c6b8c295fca6d0d00743e0d79393aca06f87effd1e55b11a5536b5dac8f2cac10ecc55de76ccaa3
+  data.tar.gz: 9ce904837ced486e9969071d33c1010e4660a9133178f145683262d7199db2ac18797ca416ddb2525975aef3c0423c0543ce7b8b6ba5e9e0299f657387037699

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.21'
+  VERSION = '0.3.22'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -201,26 +201,27 @@ module ChefMetalVsphere
 
       transport = nil
       if !ip_for(bootstrap_options, vm).nil?
+        vm_ip = ip_for(bootstrap_options, vm)
         transport = transport_for(machine_spec, machine_options, vm)
       end
 
       if transport.nil? || !transport.available?
-        action_handler.report_progress "waiting for customizations to complete"
+        action_handler.report_progress "waiting for customizations to complete and find #{vm_ip}"
         now = Time.now.utc
-        until (Time.now.utc - now) > 45 || (!vm.guest.ipAddress.nil? && vm.guest.ipAddress.length > 0) do
+        until (Time.now.utc - now) > 90 || (vm.guest.net.map { |net| net.ipAddress}.flatten).include?(vm_ip) do
           print "-"
           sleep 5
         end
-        if vm.guest.ipAddress.nil? || vm.guest.ipAddress.length == 0
+        if !(vm.guest.net.map { |net| net.ipAddress}.flatten).include?(vm_ip)
           action_handler.report_progress "rebooting..."
           if vm.guest.toolsRunningStatus != "guestToolsRunning"
-            action_handler.report_progress "tools have stopped. current power state is #{vm.runtime.powerState} and tools state is #{vm.toolsRunningStatus}. powering up server..."
+            action_handler.report_progress "tools have stopped. current power state is #{vm.runtime.powerState} and tools state is #{vm.guest.toolsRunningStatus}. powering up server..."
             start_vm(vm)
           else
             restart_server(action_handler, machine_spec, vm)
           end
           now = Time.now.utc
-          until (Time.now.utc - now) > 60 || (!vm.guest.ipAddress.nil? && vm.guest.ipAddress.length > 0) do
+          until (Time.now.utc - now) > 60 || (vm.guest.net.map { |net| net.ipAddress}.flatten).include?(vm_ip) do
             print "-"
             sleep 5
           end

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -91,7 +91,76 @@ module ChefMetalVsphere
       vim.serviceInstance.find_datacenter(dc_name) or raise("vSphere Datacenter not found [#{datacenter}]")
     end
 
+    def network_adapter_for(operation, network_name, network_label, device_key)
+        nic_backing_info = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(:deviceName => network_name)
+        connectable = RbVmomi::VIM::VirtualDeviceConnectInfo(
+          :allowGuestControl => true,
+          :connected => true,
+          :startConnected => true)
+        device = RbVmomi::VIM::VirtualVmxnet3(
+          :backing => nic_backing_info,
+          :deviceInfo => RbVmomi::VIM::Description(:label => network_label, :summary => network_name),
+          :key => device_key,
+          :connectable => connectable)
+        RbVmomi::VIM::VirtualDeviceConfigSpec(
+          :operation => operation,
+          :device => device)
+    end
+
+    def find_ethernet_cards_for(vm)
+      vm.config.hardware.device.select {|d| d.is_a?(RbVmomi::VIM::VirtualEthernetCard)}
+    end
+
     def do_vm_clone(dc_name, vm_template, vm_name, options)
+      deviceAdditions = []
+
+      clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(
+        location: relocate_spec_for(dc_name, vm_template, options),
+        powerOn: false,
+        template: false,
+        config: RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
+      )
+
+      clone_spec.customization = customization_options_from(vm_template, vm_name, options)
+
+      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 = network_device_changes(vm_template, options)
+        clone_spec.config.deviceChange = changes
+      end
+
+      vm_template.CloneVM_Task(
+        name: vm_name,
+        folder: find_folder(dc_name, options[:vm_folder]),
+        spec: clone_spec
+      ).wait_for_completion
+
+      vm = find_vm(dc_name, options[:vm_folder], vm_name)
+
+      unless options[:additional_disk_size_gb].to_s.nil?
+        deviceAdditions.push(virtual_disk_for(vm, options))
+      end
+
+      unless deviceAdditions.count == 0
+        task = vm.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => deviceAdditions))
+        task.wait_for_completion
+      end
+
+      vm
+    end
+
+    def relocate_spec_for(dc_name, vm_template, options)
       datacenter = dc(dc_name)
       if options.has_key?(:host)
         host = find_host(datacenter, options[:host])
@@ -105,15 +174,66 @@ module ChefMetalVsphere
       unless options[:datastore].to_s.empty?
         rspec.datastore = find_datastore(datacenter, options[:datastore])
       end
+      rspec
+    end
 
-      clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(
-        location: rspec,
-        powerOn: false,
-        template: false
+    def virtual_disk_for(vm, options)
+      if options[:datastore].to_s.empty? 
+        raise ":datastore must be specified when adding a disk to a cloned vm"
+      end
+      idx = vm.disks.count
+      RbVmomi::VIM::VirtualDeviceConfigSpec(
+            :operation     => :add,
+            :fileOperation => :create,
+            :device        => RbVmomi::VIM.VirtualDisk(
+              :key           => idx,
+              :backing       => RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
+                :fileName        => "[#{options[:datastore]}]",
+                :diskMode        => 'persistent',
+                :thinProvisioned => true
+              ),
+              :capacityInKB  => options[:additional_disk_size_gb] * 1024 * 1024,
+              :controllerKey => 1000,
+              :unitNumber    => idx
+            )
       )
+    end
 
-      clone_spec.config = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
+    def network_device_changes(vm_template, options)
+      additions = []
+      changes = []
+      networks=options[:network_name]
+      if networks.kind_of?(String)
+        networks=[networks]
+      end
+
+      cards = find_ethernet_cards_for(vm_template)
 
+      key = 4000
+      networks.each_index do | i |
+        if card = cards.shift
+          key = card.key
+          operation = RbVmomi::VIM::VirtualDeviceConfigSpecOperation('edit')
+          puts "changing template nic for #{networks[i]}"
+          changes.push(
+            network_adapter_for(operation, networks[i], "Network Adapter #{i+1}", key))
+        else
+          key = key + 1
+          operation = RbVmomi::VIM::VirtualDeviceConfigSpecOperation('add')
+          puts "will be adding nic for #{networks[i]}"
+          additions.push(
+            network_adapter_for(operation, networks[i], "Network Adapter #{i+1}", key))
+        end
+      end
+      [additions, changes]
+    end
+
+    def find_datastore(dc, datastore_name)
+        baseEntity = dc.datastore
+        baseEntity.find { |f| f.info.name == datastore_name } or raise "no such datastore #{datastore_name}"    
+    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]
@@ -130,38 +250,12 @@ module ChefMetalVsphere
             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 = RbVmomi::VIM::CustomizationFixedName.new(:name => cust_options[:hostname]) if cust_options.key?(:hostname)
-            cust_hostname ||= RbVmomi::VIM::CustomizationFixedName.new(:name => vm_name)
+            cust_hostname = hostname_from(options[:customization_spec], vm_name)
             cust_hwclockutc = cust_options[:hw_clock_utc]
             cust_timezone = cust_options[:time_zone]
 
             if vm_template.config.guestId.start_with?('win')
-              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_id = RbVmomi::VIM::CustomizationIdentification.new(
-                :joinWorkgroup => 'WORKGROUP')
-              cust_password = RbVmomi::VIM::CustomizationPassword(
-                :plainText => true,
-                :value => options[:ssh][:password])
-              cust_gui_unattended = RbVmomi::VIM::CustomizationGuiUnattended.new(
-                :autoLogon => true,
-                :autoLogonCount => 1,
-                :password => cust_password,
-                :timeZone => cust_options[:win_time_zone])
-              cust_userdata = RbVmomi::VIM::CustomizationUserData.new(
-                :computerName => cust_hostname,
-                :fullName => cust_options[:org_name],
-                :orgName => cust_options[:org_name],
-                :productId => cust_options[:product_id])
-              cust_prep = RbVmomi::VIM::CustomizationSysprep.new(
-                :guiRunOnce => cust_runonce,
-                :identification => cust_id,
-                :guiUnattended => cust_gui_unattended,
-                :userData => cust_userdata)
+              cust_prep = windows_prep_for(options, vm_name)
             else
               cust_prep = RbVmomi::VIM::CustomizationLinuxPrep.new(
                 :domain => cust_domain,
@@ -170,84 +264,52 @@ module ChefMetalVsphere
                 :timeZone => cust_timezone)
             end
               cust_adapter_mapping = [RbVmomi::VIM::CustomizationAdapterMapping.new(:adapter => cust_ip_settings)]
-              cust_spec = RbVmomi::VIM::CustomizationSpec.new(
+              RbVmomi::VIM::CustomizationSpec.new(
                 :identity => cust_prep,
                 :globalIPSettings => cust_global_ip_settings,
                 :nicSettingMap => cust_adapter_mapping)
         else
-          cust_spec = find_customization_spec(options[:customization_spec])
+          find_customization_spec(options[:customization_spec])
         end
-        clone_spec.customization = cust_spec
-      end
-
-      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].to_s.nil?
-        config_spec_operation = RbVmomi::VIM::VirtualDeviceConfigSpecOperation('edit')
-        nic_backing_info = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(:deviceName => options[:network_name])
-        connectable = RbVmomi::VIM::VirtualDeviceConnectInfo(
-          :allowGuestControl => true,
-          :connected => true,
-          :startConnected => true)
-        device = RbVmomi::VIM::VirtualVmxnet3(
-          :backing => nic_backing_info,
-          :deviceInfo => RbVmomi::VIM::Description(:label => "Network adapter 1", :summary => options[:network_name]),
-          :key => 4000,
-          :connectable => connectable)
-        device_spec = RbVmomi::VIM::VirtualDeviceConfigSpec(
-          :operation => config_spec_operation,
-          :device => device)
-
-        clone_spec.config.deviceChange.push device_spec
-      end
-
-      vm_template.CloneVM_Task(
-        name: vm_name,
-        folder: find_folder(dc_name, options[:vm_folder]),
-        spec: clone_spec
-      ).wait_for_completion
-
-    vm = find_vm(dc_name, options[:vm_folder], vm_name)
-
-    unless options[:additional_disk_size_gb].to_s.nil?
-      if options[:datastore].to_s.empty? 
-        raise ":datastore must be specified when adding a disk to a cloned vm"
-      end
-      idx = vm.disks.count
-      task = vm.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange =>[RbVmomi::VIM::VirtualDeviceConfigSpec(
-            :operation     => :add,
-            :fileOperation => :create,
-            :device        => RbVmomi::VIM.VirtualDisk(
-              :key           => idx,
-              :backing       => RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
-                :fileName        => "[#{options[:datastore]}]",
-                :diskMode        => 'persistent',
-                :thinProvisioned => true
-              ),
-              :capacityInKB  => options[:additional_disk_size_gb] * 1024 * 1024,
-              :controllerKey => 1000,
-              :unitNumber    => idx
-            )
-      )]))
-      task.wait_for_completion
     end
 
-    vm
+    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_id = RbVmomi::VIM::CustomizationIdentification.new(
+        :joinWorkgroup => 'WORKGROUP')
+      cust_password = RbVmomi::VIM::CustomizationPassword(
+        :plainText => true,
+        :value => options[:ssh][:password])
+      cust_gui_unattended = RbVmomi::VIM::CustomizationGuiUnattended.new(
+        :autoLogon => true,
+        :autoLogonCount => 1,
+        :password => cust_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 find_datastore(dc, datastore_name)
-        baseEntity = dc.datastore
-        baseEntity.find { |f| f.info.name == datastore_name } or raise "no such datastore #{datastore_name}"    
+    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_host(dc, host_name)

data/spec/integration_tests/config.rb

@@ -14,7 +14,7 @@
 	  		:vm_folder => 'DLAB',
 	  		:datastore => 'QA1-2-SFIRE-01',
 	  		:num_cpus => 2,
-	  		:network_name => 'vlan_20_172.21.20',
+	  		:network_name => ['vlan_20_172.21.20', 'vlan10_172.21.10-vm'],
 	  		:memory_mb => 4096,
 	  		:resource_pool => 'CLSTR02/DLAB',
 	  		:additional_disk_size_gb => 50,
@@ -27,6 +27,7 @@
 		  	:convergence_options => {},
 	        :customization_spec => {
 	          :ipsettings => {
+	          	:ip => '172.21.20.190',
 	            :subnetMask => '255.255.255.0',
 	            :gateway => ["172.21.20.1"],
 	            :dnsServerList => ["172.17.1.26","172.17.1.27"]

data/spec/integration_tests/vsphere_driver_spec.rb

@@ -39,7 +39,6 @@ describe "vsphere_driver" do
 
 	before :all do
 		@vm_name = "cmvd-test-#{SecureRandom.hex}"
-		#@vm_name = "cmvd-test-ee744c7bd5588f743c175dfc4100f172"
 		@metal_config = eval File.read(File.expand_path('../config.rb', __FILE__))
 		Cheffish.honor_local_mode do
 			chef_server = Cheffish.default_chef_server(@metal_config)
@@ -74,8 +73,9 @@ describe "vsphere_driver" do
 		it "has the correct amount of memory" do
 			expect(@vm.config.hardware.memoryMB).to eq(@metal_config[:machine_options][:bootstrap_options][:memory_mb])
 		end
-		it "is on the correct network" do
-			expect(@vm.network[0].name).to eq(@metal_config[:machine_options][:bootstrap_options][:network_name])
+		it "is on the correct networks" do
+			expect(@vm.network.map {|n| n.name}).to include(@metal_config[:machine_options][:bootstrap_options][:network_name][0])
+			expect(@vm.network.map {|n| n.name}).to include(@metal_config[:machine_options][:bootstrap_options][:network_name][1])
 		end
 		it "is on the correct datastore" do
 			expect(@vm.datastore[0].name).to eq(@metal_config[:machine_options][:bootstrap_options][:datastore])
@@ -105,12 +105,12 @@ describe "vsphere_driver" do
 		it "has the correct IP address" do
 	      if @vm.guest.toolsRunningStatus != "guestToolsRunning"
 	      	now = Time.now.utc
-	        until (Time.now.utc - now) > 30 || (@vm.guest.toolsRunningStatus == "guestToolsRunning" && !@vm.guest.ipAddress.nil? && @vm.guest.ipAddress.length > 0) do
+	        until (Time.now.utc - now) > 30 || (@vm.guest.toolsRunningStatus == "guestToolsRunning" && @vm.guest.net.count == 2 && @vm.guest.net[1].ipAddress[1] == @metal_config[:machine_options][:bootstrap_options][:customization_spec][:ipsettings][:ip]) do
 	          print "."
 	          sleep 5
 	        end
 	      end
-			expect(@vm.guest.ipAddress).to eq(@metal_config[:machine_options][:bootstrap_options][:customization_spec][:ipsettings][:ip])
+			expect(@vm.guest.net[1].ipAddress[1]).to eq(@metal_config[:machine_options][:bootstrap_options][:customization_spec][:ipsettings][:ip])
 		end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.3.22
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef