clc-chef-metal-vsphere 0.3.36 → 0.3.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 738fda0ee5a8377349e3823f4c893a1e4e610f3d
-  data.tar.gz: 3b0bc2bfaa0ebf2a23d698139a9a6ea6e27d152f
+  metadata.gz: a0783ab8e7deb238bcd63613ffdb35cfb342034f
+  data.tar.gz: e538c2b3f5023184862db5e79e504c10a8a58bc3
 SHA512:
-  metadata.gz: d4453f11db5172b1fd720d67a5e86e2bfe441020cf9dda66d9d74f31033c63cf81fd2b5eba56c821146a027556d5c1346d14c1d38fc93e4195cd72b41c1c4609
-  data.tar.gz: 76a8092cc0218fb18252c3baa1f221dfb369fd827b8756b02823627e2c2c833d443e3878194dc15abf1a83ab17c3adaf3072c9a7f723ffeb137aca12a23accaf
+  metadata.gz: 54577970fbdcee6fcdf8a47d4f193cde9d21b7f9ae775db5889473bc0cffb718ffd435ffa7b892644d7324a7f4fbe37518a5681b26efd3f6242e7011b24c3a50
+  data.tar.gz: a59b49d388f7fbaa10d1ae33bb7648d926614bbcccaaa9f7c5c2f1436ccf85b9a29a6a3d55bf502cb1ffc9fdcb50d7592969d5295b3916902972b8ec76dd1d9d

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.36'
+  VERSION = '0.3.37'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -223,12 +223,14 @@ module ChefMetalVsphere
             restart_server(action_handler, machine_spec, vm)
           end
           now = Time.now.utc
-          until (Time.now.utc - now) > 60 || (vm.guest.net.map { |net| net.ipAddress}.flatten).include?(vm_ip) do
+          until (Time.now.utc - now) > 90 || (vm.guest.net.map { |net| net.ipAddress}.flatten).include?(vm_ip) do
+            vm_ip = ip_for(bootstrap_options, vm) if vm_ip.nil?
             print "-"
             sleep 5
           end
         end
-        action_handler.report_progress "IP address obtained: #{vm.guest.ipAddress}"
+        machine_spec.location['ipaddress'] = vm.guest.ipAddress
+        action_handler.report_progress "IP address obtained: #{machine_spec.location['ipaddress']}"
       end
 
       domain = bootstrap_options[:customization_spec][:domain]

data/lib/kitchen/driver/vsphere.rb

@@ -0,0 +1,28 @@
+require 'kitchen/driver/vsphere_common'
+
+module Kitchen
+  module Driver
+    class Vsphere < Kitchen::Driver::SSHBase
+
+      default_config :machine_options,
+        :start_timeout => 600,
+        :create_timeout => 600,
+        :ready_timeout => 90,
+        :bootstrap_options => {
+          :use_linked_clone => true,
+          :ssh => {
+            :user => 'root',
+            :paranoid => false,
+            :port => 22
+          },
+          :convergence_options => {},
+          :customization_spec => {
+            :domain => 'local'
+          }
+        }
+
+      include Kitchen::Driver::VsphereCommon
+
+    end
+  end
+end

data/lib/kitchen/driver/vsphere_common.rb

@@ -0,0 +1,49 @@
+require 'benchmark'
+require 'kitchen'
+require 'chef_metal_vsphere/vsphere_driver'
+require 'chef_metal/chef_machine_spec'
+
+module Kitchen
+  module Driver
+  	module VsphereCommon
+      def create(state)
+        config[:server_name] ||= "kitchen-#{SecureRandom.hex}-#{instance.name}"
+        state[:username] = config[:machine_options][:bootstrap_options][:ssh][:user]
+        state[:password] = config[:machine_options][:bootstrap_options][:ssh][:password]
+        
+        machine = with_metal_driver(config[:server_name]) do | action_handler, driver, machine_spec|
+      	  driver.allocate_machine(action_handler, machine_spec, config[:machine_options])
+      	  driver.ready_machine(action_handler, machine_spec, config[:machine_options])
+          state[:server_id] = machine_spec.location['server_id']
+          state[:hostname] = machine_spec.location['ipaddress']
+          state[:vsphere_name] = config[:server_name]
+        end
+      end
+
+      def destroy(state)
+        return if state[:server_id].nil?
+
+        with_metal_driver(state[:vsphere_name]) do | action_handler, driver, machine_spec|
+          machine_spec.location = { 'driver_url' => driver.driver_url,
+                        'server_id' => state[:server_id]}
+          driver.destroy_machine(action_handler, machine_spec, config[:machine_options])
+        end
+
+        state.delete(:server_id)
+        state.delete(:hostname)
+        state.delete(:vsphere_name)
+      end
+
+      def with_metal_driver(name, &block)
+        Cheffish.honor_local_mode do
+          chef_server = Cheffish.default_chef_server(Cheffish.profiled_config)
+          config[:machine_options][:convergence_options] = {:chef_server => chef_server}
+          machine_spec = ChefMetal::ChefMachineSpec.new({'name' => name}, chef_server)
+          driver = ChefMetal.driver_for_url("vsphere://#{config[:driver_options][:host]}", config)
+          action_handler = ChefMetal::ActionHandler.new
+          block.call(action_handler, driver, machine_spec)
+        end
+      end
+  	end
+  end
+end

data/lib/kitchen/driver/vsphere_windows.rb

@@ -0,0 +1,29 @@
+require 'kitchen/driver/vsphere_common'
+
+module Kitchen
+  module Driver
+    class VsphereWindows < Kitchen::Driver::WinRMBase
+
+      default_config :machine_options,
+        :start_timeout => 600,
+        :create_timeout => 600,
+        :ready_timeout => 90,
+        :bootstrap_options => {
+          :use_linked_clone => true,
+          :ssh => {
+            :user => 'administrator',
+          },
+          :convergence_options => {},
+          :customization_spec => {
+            :domain => 'local',
+            :org_name => 'Tier3',
+            :product_id => 'W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9',
+            :win_time_zone => 4
+          }
+        }
+
+      include Kitchen::Driver::VsphereCommon
+
+    end
+  end
+end

data/spec/integration_tests/config.rb

@@ -1,52 +1,52 @@
-	{
-	  :driver_options => { 
-	  	:host => '172.21.10.10',
-	  	:user => 'vmapi',
-	  	:password => 'Pass@word1',
-	  	:insecure => true
-	  },
-	  :machine_options => { 
-			:start_timeout => 600,
-            :create_timeout => 600,
-            :ready_timeout => 300,
-            :bootstrap_options => {
-            :use_linked_clone => true,
-	  		:datacenter => 'QA1',
-	  		#:template_name => 'UBUNTU-12-64-TEMPLATE',
-	  		:template_name => 'WINDEVOPS2012R2',
-	  		:vm_folder => 'DLAB',
-	  		:datastore => 'QA1-2-SFIRE-01',
-	  		:num_cpus => 2,
-	  		#:network_name => ['vlan_20_172.21.20'],
-	  		#:network_name => ['vlan10_172.21.10-vm'],
-	  		:network_name => ['vlan10_172.21.10-vm', 'vlan_20_172.21.20'],
-	  		:memory_mb => 4096,
-	  		:resource_pool => 'CLSTR02/DLAB',
-	  		:additional_disk_size_gb => 50,
-		  	:ssh => {
-		  		#:user => 'root',
-		  		:user => 'administrator',
-		  		:password => 'Password123',
-		  		:paranoid => false,
-		  		:port => 22
-		  	},
-		  	:convergence_options => {},
-	        :customization_spec => {
-	          :ipsettings => {
-	          	:ip => '172.21.10.190',
-	            :subnetMask => '255.255.255.0',
-	            :gateway => ["172.21.10.1"],
-	            :dnsServerList => ["192.168.64.19","192.168.64.20"]
-	          },
-	          :domain => 't3n.dom',
-	          :domainAdmin => "tier3sa@t3n.dom",
-	          :domainAdminPassword => '4u2bn01!!@#$',
-	          :org_name => 'Tier3',
-	          :product_id => 'W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9',
-	          :win_time_zone => 4
-	        }
-	  	}
-	  },
-	  :log_level => :debug
-	}
+{
+  :driver_options => { 
+  	:host => '172.21.10.10',
+  	:user => 'vmapi',
+  	:password => 'Pass@word1',
+  	:insecure => true
+  },
+  :machine_options => { 
+		:start_timeout => 600,
+        :create_timeout => 600,
+        :ready_timeout => 300,
+        :bootstrap_options => {
+        :use_linked_clone => true,
+  		:datacenter => 'QA1',
+  		#:template_name => 'UBUNTU-12-64-TEMPLATE',
+  		:template_name => 'WINDEVOPS2012R2',
+  		:vm_folder => 'DLAB',
+  		:datastore => 'QA1-2-SFIRE-01',
+  		:num_cpus => 2,
+  		#:network_name => ['vlan_20_172.21.20'],
+  		#:network_name => ['vlan10_172.21.10-vm'],
+  		:network_name => ['vlan10_172.21.10-vm', 'vlan_20_172.21.20'],
+  		:memory_mb => 4096,
+  		:resource_pool => 'CLSTR02/DLAB',
+  		:additional_disk_size_gb => 50,
+	  	:ssh => {
+	  		#:user => 'root',
+	  		:user => 'administrator',
+	  		:password => 'Password123',
+	  		:paranoid => false,
+	  		:port => 22
+	  	},
+	  	:convergence_options => {},
+        :customization_spec => {
+          :ipsettings => {
+          	:ip => '172.21.10.190',
+            :subnetMask => '255.255.255.0',
+            :gateway => ["172.21.10.1"],
+            :dnsServerList => ["192.168.64.19","192.168.64.20"]
+          },
+          :domain => 't3n.dom',
+          :domainAdmin => "tier3sa@t3n.dom",
+          :domainAdminPassword => '4u2bn01!!@#$',
+          :org_name => 'Tier3',
+          :product_id => 'W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9',
+          :win_time_zone => 4
+        }
+  	}
+  },
+  :log_level => :debug
+}
 

data/spec/integration_tests/vsphere_driver_spec.rb

@@ -1,5 +1,4 @@
 require 'chef_metal_vsphere/vsphere_driver'
-#require 'chef_metal_vsphere/ubuntu_patch'
 require 'chef_metal/chef_machine_spec'
 
 	# A file named config.rb in the same directory as this spec file 
@@ -41,7 +40,7 @@ describe "vsphere_driver" do
 		@vm_name = "cmvd-test-#{SecureRandom.hex}"
 		@metal_config = eval File.read(File.expand_path('../config.rb', __FILE__))
 		Cheffish.honor_local_mode do
-			chef_server = Cheffish.default_chef_server(@metal_config)
+			chef_server = Cheffish.default_chef_server(Cheffish.profiled_config)
 			puts "chef server:#{chef_server}"
 			@machine_spec = ChefMetal::ChefMachineSpec.new({'name' => @vm_name}, chef_server)
 			@driver = ChefMetal.driver_for_url("vsphere://#{@metal_config[:driver_options][:host]}", @metal_config)
@@ -125,7 +124,7 @@ describe "vsphere_driver" do
 
 		it "removes the machine" do
 			Cheffish.honor_local_mode do
-				chef_server = Cheffish.default_chef_server(@metal_config)
+				chef_server = Cheffish.default_chef_server(Cheffish.profiled_config)
 				driver = ChefMetal.driver_for_url("vsphere://#{@metal_config[:driver_options][:host]}", @metal_config)
 				action_handler = ChefMetal::ActionHandler.new
 				machine_spec = ChefMetal::ChefMachineSpec.new({'name' => @vm_name}, chef_server)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.36
+  version: 0.3.37
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -95,6 +95,9 @@ files:
 - lib/chef_metal_vsphere/vsphere_driver.rb
 - lib/chef_metal_vsphere/vsphere_helpers.rb
 - lib/chef_metal_vsphere/vsphere_url.rb
+- lib/kitchen/driver/vsphere.rb
+- lib/kitchen/driver/vsphere_common.rb
+- lib/kitchen/driver/vsphere_windows.rb
 - spec/integration_tests/.gitignore
 - spec/integration_tests/config.rb
 - spec/integration_tests/vsphere_driver_spec.rb