kitchen-softlayer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e44a5783e05b9286591d821314810a2a02ffb34b
-  data.tar.gz: 1d363218e182ec5f95ce36abeb61479aecdbd73a
+  metadata.gz: 6d1661e12830eb0495414973d5d91ce6bc19fbdc
+  data.tar.gz: b5867f90480c3181208fca35f6e56a7c642bb4fe
 SHA512:
-  metadata.gz: 2983c4cba5a69f4316a8d33378c019a81387fdd8e8f249ca4afd2fd158839bcd039da57759661f7365c5e980e40f60fca7a0fa36ef9bbd85876a48beca590f09
-  data.tar.gz: 37801e1b1992e929b64203a8c5f062b620aa4e3968798cd262df55afadd944ee7ceba037f88361064d777b7b8bd2c24511e77cfdf52d392540cb4e580ae8a013
+  metadata.gz: 464904655b21d7914156abcb90b58a4b409607bdb65283bf24ffdba540290fd4222a871b14bbea2df6bd106e773e0b872dfdb39d1fd1628d4f9535d52aa02928
+  data.tar.gz: 02452ddd30ee043e0192942ba9bcd9ec6102553d59563eab0a5fbb86155f3c04eeebed2a14e417ee3cb84e2458f17fb57f75f7dfd89481a1ba27c6cf49c6f7aa

data/README.md

@@ -115,6 +115,8 @@ image_id | nil | image id for server
 ephemeral_storage | nil | storage
 network_components | nil | network
 ssh_timeout | 300 | timeout to ssh when server starting
+destroy_wait | true | wait for destroy to complete
+destroy_timeout | 300 | timeout to wait until server destroyed
 account_id | nil | softlayer account id
 datacenter | ENV['softlayer_default_datacenter'] | datacenter code
 single_tenant | false | don't share server

data/kitchen-softlayer.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   candidates += ['CHANGELOG.md', 'kitchen-softlayer.gemspec']
   spec.files = candidates.sort
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.0.0'
   spec.add_dependency 'test-kitchen', '~> 1.4'
   spec.add_dependency 'fog', '~> 1.18'
   spec.add_dependency 'fog-softlayer', '~> 0.4'

data/lib/kitchen/driver/softlayer.rb

@@ -56,6 +56,8 @@ module Kitchen
       default_config :softlayer_default_datacenter, ENV['softlayer_default_datacenter']
       default_config :softlayer_default_domain, ENV['softlayer_default_domain']
       default_config :ssh_timeout, 300
+      default_config :destroy_wait, true
+      default_config :destroy_timeout, 300
       default_config :account_id, nil
       default_config :datacenter, ENV['softlayer_default_datacenter']
       default_config :single_tenant, false
@@ -96,7 +98,8 @@ module Kitchen
 
         config[:disable_ssl_validation] && disable_ssl_validation
         server = compute.servers.get(state[:server_id])
-        server.destroy unless server.nil?
+        server.destroy unless server.nil? || server.id.nil?
+        wait_for_server_to_delete(state) if config[:destroy_wait]
         info "Softlayer instance <#{state[:server_id]}> destroyed."
         state.delete(:server_id)
         state.delete(:hostname)
@@ -104,6 +107,16 @@ module Kitchen
 
       private
 
+      def wait_for_server_to_delete(state)
+        ((config[:destroy_timeout].to_i / 15).floor).times do
+          info 'Deleting server in softlayer'
+          sleep 15
+          server = compute.servers.get(state[:server_id])
+          return if server.nil? || server.id.nil?
+        end
+        fail "#{config[:destroy_timeout]} seconds went by and server not deleted by softlayer"
+      end
+
       def wait_for_ssh_key_access(state)
         new_state = build_ssh_args(state)
         new_state[2][:number_of_password_prompts] = 0

data/lib/kitchen/driver/softlayer_version.rb

@@ -15,6 +15,6 @@
 module Kitchen
   # Version string for Softlayer Kitchen driver
   module Driver
-    SOFTLAYER_VERSION = '0.0.2'
+    SOFTLAYER_VERSION = '0.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="