kitchen-vsphere 0.1.0.alpha.2 → 0.2.0.dev

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: df4f18e157e77b6791c40d11da505a8ab10c2041
+  data.tar.gz: 6864359fe65db00d50cd829f705f6d4a3d8079ab
+SHA512:
+  metadata.gz: c2c6abd45a9c27fb2baa49dea1952b43fb329841640465b9325d20f6e9aa4ccefc58549115a5593913e7b04ce6f17273bb5886ac25220c8159b75419fa0e0718
+  data.tar.gz: 5e0d7bc21597160b9530aadcbca3f3f3f9633df1079dfab119f961d6632186ad44fb3a505c5f374cd34def9db2c28809abeac7e3d6766497125c7656e3331344

data/CHANGELOG.md

@@ -1,3 +1,8 @@
-## 0.1.0 / Unreleased
+## 0.1.0
 
-* Initial release
+* Initial release
+
+## 0.2.0 /unreleased
+
+* Wait for public IP address
+* Retry for a good IP address

data/kitchen-vsphere.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'test-kitchen', '~> 1.0'
+  gem.add_dependency 'rbvmomi'
   gem.add_dependency 'fog'
 
   gem.add_development_dependency 'cane'

data/lib/kitchen/driver/vsphere.rb

@@ -22,6 +22,7 @@ require 'kitchen'
 require 'etc'
 require 'ipaddr'
 require 'socket'
+require 'timeout'
 
 module Kitchen
   module Driver
@@ -33,14 +34,27 @@ module Kitchen
       default_config :use_ipv6, false
       default_config :upload_public_ssh_key, true
 
+      def wait_for_sshd_updating_ip(state, server)
+        begin
+          state[:hostname] = server.public_ip_address
+          timeout(5) {
+            wait_for_sshd(state[:hostname], config[:username],
+              { :port => config[:port] })
+            info "SSH connected to #{state[:hostname]}:#{config[:port]}"
+          }
+        rescue Timeout::Error
+          server = compute.servers.get(state[:server_id])
+          retry if server
+          raise ActionFailed, 'Server deleted'
+        end
+      end
+
       def create(state)
         config[:server_name] ||= generate_name(instance.name)
         server = create_server(state)
-        state[:hostname] = server.ipaddress
-        wait_for_sshd(state[:hostname], config[:username],
-          { :port => config[:port] }) ; info '(ssh ready)'
+        wait_for_sshd_updating_ip(state, server)
         if config[:upload_public_ssh_key]
-          upload_public_ssh_key(state, config, server)
+          upload_public_ssh_key(state, config)
         end
       rescue ::Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
@@ -81,8 +95,12 @@ module Kitchen
         clone_results = compute.vm_clone(server_configed)
         server = compute.servers.get(clone_results['new_vm']['id'])
         state[:server_id] = server.id
-        info "VSphere instance <#{state[:server_id]}> created."
-        server.wait_for { print '.'; tools_state != 'toolsNotRunning' }
+        state[:server_vmname] = server.name
+        info "VSphere instance <#{server.id}>, '#{server.name}' created."
+        server.wait_for {
+          print '.'
+          tools_state != 'toolsNotRunning' && public_ip_address
+        }
         puts "\n(server ready)"
         server
       end
@@ -108,7 +126,7 @@ module Kitchen
         pieces.join sep
       end
 
-      def upload_public_ssh_key(state, config, server)
+      def upload_public_ssh_key(state, config)
         ssh = ::Fog::SSH.new(state[:hostname], config[:username],
           { :password => config[:password] })
         pub_key = open(config[:public_key_path]).read

data/lib/kitchen/driver/vsphere_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for vsphere Test Kitchen driver
-    VSPHERE_VERSION = '0.1.0.alpha.2'
+    VSPHERE_VERSION = '0.2.0.dev'
   end
 end

metadata

@@ -1,94 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.2
-  prerelease: 6
+  version: 0.2.0.dev
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rbvmomi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Test Kitchen Driver for VMWare vShere
@@ -98,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .tailor
-- .travis.yml
+- ".gitignore"
+- ".tailor"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -112,27 +115,26 @@ files:
 homepage: https://github.com/mwrock/kitchen-vsphere
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Test Kitchen Driver for VMWare vShere
 test_files: []
 has_rdoc: