clc-chef-metal-vsphere 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65941817e8050f25e838c833e94d2c0c554bc312
-  data.tar.gz: 15037d9d8719b95df328775ca65fdfec35610e53
+  metadata.gz: d464aa0043a0be506299d2fb8a26d16bb7eb917b
+  data.tar.gz: f2d96205badcfac32a1fbabace096f98e9dcef6e
 SHA512:
-  metadata.gz: 4e78ed7552dba3e8f98db5273cfd60eb89f00fdfb9c5c54fa15640226d512c71dc91e75a684c6671b572b1ad4f820d778b7d10c806da0d84f00c7ddd123d5821
-  data.tar.gz: dc7166e72a5dd38abcb3fcabba15fc2b7dc220927d8c6bd963d567068d5fe7151d0e934a0cccba1dbddae89b85d21f5cb5af34cfc00a23aeaf57c4bc6736e1fe
+  metadata.gz: 923c9de0efdd6076810b7b485a465be341cadb4cf53c1d849f50dd8f0ef58ef88c8a62e1bc2fbaf34163d50f18469c230f100bf4e551ccf4a805534e59344936
+  data.tar.gz: b8c024e18c2f2199e944f5d0706efa06c57c31236f1a397d5721f9a11f3a8361a35312bbc7c48becce019707938be7a01a4781cfc1b1b283cb36a2dc485a5864

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.3.15'
+  VERSION = '0.3.16'
 end

data/lib/chef_metal_vsphere/vsphere_driver.rb

@@ -197,7 +197,6 @@ module ChefMetalVsphere
 
       wait_until_ready(action_handler, machine_spec, machine_options, vm)
 
-
       bootstrap_options = bootstrap_options_for(machine_spec, machine_options)
       is_static = false
       if has_static_ip(bootstrap_options)
@@ -441,7 +440,7 @@ module ChefMetalVsphere
 
           _self = self
 
-          until remaining_wait_time(machine_spec, machine_options) || transport.available? do
+          until remaining_wait_time(machine_spec, machine_options) < 0 || transport.available? do
             print "."
             sleep 5
           end

data/spec/integration_tests/vsphere_driver_spec.rb

@@ -38,8 +38,7 @@ describe "vsphere_driver" do
     include ChefMetalVsphere::Helpers
 
 	before :all do
-		#@vm_name = "cmvd-test-#{SecureRandom.hex}"
-		@vm_name = "cmvd-test-41f91ed95145ffabc045df653b69ef1d"
+		@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)
@@ -51,9 +50,6 @@ 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']
-			machine.setup_convergence(action_handler)
-			@machine_spec.save(action_handler)
-			machine.converge(action_handler)
 			@connection = vim(@metal_config[:driver_options])
 			@vm = find_vm_by_id(@server_id, @connection)
 		end
@@ -117,20 +113,20 @@ describe "vsphere_driver" do
 		end
     end
 
-	# context "destroy_machine" do
+	context "destroy_machine" do
 
-	# 	it "removes the machine" do
-	# 		Cheffish.honor_local_mode do
-	# 			chef_server = Cheffish.default_chef_server(@metal_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)
-	# 			machine_spec.location = { 'driver_url' => driver.driver_url,
-	# 									  'server_id' => @server_id}
-	# 			driver.destroy_machine(action_handler, machine_spec, @metal_config[:machine_options])
-	# 		end
-	# 		vm = find_vm_by_id(@server_id, @connection)
-	# 		expect(vm).to eq(nil)
-	# 	end
-	# end
+		it "removes the machine" do
+			Cheffish.honor_local_mode do
+				chef_server = Cheffish.default_chef_server(@metal_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)
+				machine_spec.location = { 'driver_url' => driver.driver_url,
+										  'server_id' => @server_id}
+				driver.destroy_machine(action_handler, machine_spec, @metal_config[:machine_options])
+			end
+			vm = find_vm_by_id(@server_id, @connection)
+			expect(vm).to eq(nil)
+		end
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clc-chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - CenturyLink Cloud
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1.alpha.3
+        version: 0.12.1.alpha.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1.alpha.3
+        version: 0.12.1.alpha.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement