kitchen-rax 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4900a69b56ac71b3d3020872845bb6f8ad64784
-  data.tar.gz: 812f068a487fa640559475440a67eb5f729dc433
+  metadata.gz: 98f16b2c39bbd6b0adf07f393824972fbd705036
+  data.tar.gz: cbd1fe8a828cc0b137c6dd48a29000fd6c915440
 SHA512:
-  metadata.gz: 64767fa00f3389394cf40c64c8af7af6df116a64ea92c9b649a109b64104a833d9803b55b9c20b814b1d881ac2442de4372386c9bdd9be6b79fcd1979e7aea97
-  data.tar.gz: 1902fcde2c9ad0d79a976c307b061dcb85360e8091d46d6e1f28027d366067ec309ff5ba4a95fbdb88c141cd007df33fc20ef3b8e4e7a43420498d5a37f05a3a
+  metadata.gz: aff67bad596628a0610c2067bdd5260b3ac96455ad90431ba25e0f8af0950b36fb74517618db34fdbd044ef04e8487cd1bf22520f9bbfcf8c7aac93c42a96550
+  data.tar.gz: ebb2516cdcb58ff8793e27f053291a259018fbeea1baad62fd21a4f4baecd5fe54fbe7e2684aa0db6a50285f4513f48d50d674530da29dfceaa26b417768875f

data/lib/kitchen/driver/cloud.rb

@@ -0,0 +1,40 @@
+module Kitchen
+
+  module Driver
+
+		class Cloud
+
+			def self.compute(config)
+				server_def = { provider: 'Rackspace' }
+				opts = [:version, :rackspace_username, :rackspace_api_key, :rackspace_region]
+				opts.each do |opt|
+					server_def[opt] = config[opt]
+				end
+				Fog::Compute.new(server_def)
+			end
+
+			def self.create_server(instance, config)
+				server_def = { name: generate_name(instance), config_drive: true}
+				[:image_id, :flavor_id, :personality].each do |opt|
+					server_def[opt] = config[opt]
+				end
+				server_def[:no_passwd_lock] = true
+				server = compute(config).servers.new(server_def)
+				server.save
+				server
+			end
+
+			private
+
+			def generate_name(instance)
+				[
+					instance.name.gsub(/\W/, '')[0..14],
+					(Etc.getlogin || 'nologin').gsub(/\W/, '')[0..14],
+					Socket.gethostname.gsub(/\W/, '')[0..22],
+					Array.new(7) { rand(36).to_s(36) }.join
+				].join('-')
+			end
+
+		end
+  end
+end

data/lib/kitchen/driver/rax.rb

@@ -15,6 +15,7 @@ module Kitchen
 			default_config :rackspace_region, 'lon'
 			default_config :wait_for, 600
 			default_config :image_id
+			default_config :personality
 			default_config :networks, nil
 
 			default_config :rackspace_username do
@@ -35,15 +36,10 @@ module Kitchen
 			end
 
 			def create(state)
-				server = create_server
-				state[:server_id] = server.id
-				info("Rackspace instance <#{state[:server_id]}> created.")
-				server.wait_for { ready? }
-				info("The instance has finished building.")
-				rackconnect_check(server)
-				info("The instance is ready to accept connections on IP #{server.public_ip_address} with password #{server.password}.")
-				state[:hostname] = server.public_ip_address
-				state[:password] = server.password
+				info("Creating a new Rackspace instance.")
+				server = Kitchen::Driver::cloud.create_server(instance, config)
+				wait_for_build_completion(server, state)
+				check_winrm_connectivity(instance, server.public_ip_address, server.password)
 			rescue Fog::Errors::Error, Excon::Errors::Error => ex
 				raise ActionFailed, ex.message
 			end
@@ -59,30 +55,21 @@ module Kitchen
 
 			private
 
-		 def compute
-			 server_def = { provider: 'Rackspace' }
-			 opts = [:version, :rackspace_username, :rackspace_api_key, :rackspace_region]
-			 opts.each do |opt|
-				 server_def[opt] = config[opt]
-			 end
-			 Fog::Compute.new(server_def)
-		 end
+			def wait_for_build_completion(server, state)
+				state[:server_id] = server.id
+				info("Rackspace instance <#{state[:server_id]}> created.")
+				server.wait_for { ready? }
+				info("The instance has finished building.")
+				rackconnect_check(server)
+				info("The instance is ready to accept connections on IP #{server.public_ip_address} with password #{server.password}.")
+				state[:hostname] = server.public_ip_address
+				state[:password] = server.password
+			end
 
-		 def create_server
-			 server_name = [
- 				 instance.name.gsub(/\W/, '')[0..14],
- 				 (Etc.getlogin || 'nologin').gsub(/\W/, '')[0..14],
- 				 Socket.gethostname.gsub(/\W/, '')[0..22],
- 				 Array.new(7) { rand(36).to_s(36) }.join
- 			 ].join('-')
-			 server_def = { name: server_name }
-			 [:image_id, :flavor_id].each do |opt|
-				 server_def[opt] = config[opt]
-			 end
-			 server_def[:no_passwd_lock] = true
-			 server = compute.servers.new(server_def)
-			 server.save
-			 server
+		 def check_winrm_connectivity(instance, ip, password)
+			 info("Checking the WinRM port is open.")
+			 Kitchen::Driver::WinRM.check(instance, ip, password)
+			 info("The WinRM port is ready to accept connections.")
 		 end
 
 		 def rackconnect_check(server)

data/lib/kitchen/driver/rax_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Rax Kitchen driver
-    RAX_VERSION = "0.9.0"
+    RAX_VERSION = "0.10.0"
   end
 end

data/lib/kitchen/driver/winrm.rb

@@ -0,0 +1,14 @@
+module Kitchen
+
+  module Driver
+
+		class WinRM
+
+			def self.check(instance, hostname, password)
+					pseudo_state = { hostname: hostname, username: "root", password: password }
+	        instance.transport.connection(pseudo_state).wait_until_ready
+			end
+
+		end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-rax
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Olivier Kouame
@@ -127,8 +127,10 @@ files:
 - bin/console
 - bin/setup
 - kitchen-rax.gemspec
+- lib/kitchen/driver/cloud.rb
 - lib/kitchen/driver/rax.rb
 - lib/kitchen/driver/rax_version.rb
+- lib/kitchen/driver/winrm.rb
 - spec/kitchen/rax_spec.rb
 - spec/spec_helper.rb
 homepage: ''