kitchen-cloudstack 0.10.0 → 0.20.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8040fde05ddb78c105dcde532e513609778f21c
-  data.tar.gz: 4026c35590d771c985f69282d31a0913af1e46f5
+  metadata.gz: 525485d2f200010310f1cd4777a9422ceedd95cd
+  data.tar.gz: 8d965420f5a495fcd57575774ec51f91f1149784
 SHA512:
-  metadata.gz: eb0259abafb6e674cec30e039d5b21c381f53ce04a1f19969791c9ee23becce992d4d0764faad15bf9e9b73e4abd110bc38d124b097ede7fcd21380b08220e4a
-  data.tar.gz: e0a1d0c94393570a6b8d487fc0f357297af5cc82a9140a6679d767081a20bc2e72c1ac4697d9aa1376e493ba4db7274acba37603a4fca8aa284e8ff7f08a00e7
+  metadata.gz: 2349e93da6c432786b6e04d234826b2eae069ccf808fe7febe0e62326e9defbb974dc82f4b1dc1698ed1c70b55fea550acee68f973f2214b11caec0c49ef940a
+  data.tar.gz: 175d40c760a0d10e59444d1bfd8d709e03f8492e92d945b55bba3ee63841cdc2229e23cb4e27c4afe75c0455378332e8c61e75e92f6569297f5535d0419d3a8e

data/kitchen-cloudstack.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'test-kitchen', '~> 1.0', '>= 1.0.0'
-  spec.add_dependency 'fog', '~> 1.23', '>= 1.23.0'
+  spec.add_dependency 'fog', '~> 1.24', '>= 1.24.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 0'

data/lib/kitchen/driver/cloudstack.rb

@@ -64,10 +64,13 @@ module Kitchen
           options['keypair'] = config[:cloudstack_ssh_keypair_name]
         end
 
+        options[:templateid] = config[:cloudstack_template_id]
+        options[:serviceofferingid] = config[:cloudstack_serviceoffering_id]
+        options[:zoneid] = config[:cloudstack_zone_id]
+
         debug(options)
         # binding.pry
-        compute.deploy_virtual_machine(config[:cloudstack_serviceoffering_id], 
-          config[:cloudstack_template_id], config[:cloudstack_zone_id], options)
+        compute.deploy_virtual_machine(options)
       end
 
       def create(state)
@@ -86,24 +89,35 @@ module Kitchen
         debug(server)
 
         state[:server_id] = server['deployvirtualmachineresponse'].fetch('id')
-        jobid = server['deployvirtualmachineresponse'].fetch('jobid')
+        start_jobid = {'jobid' => server['deployvirtualmachineresponse'].fetch('jobid')}
         info("CloudStack instance <#{state[:server_id]}> created.")
-        debug("Job ID #{jobid}")
+        debug("Job ID #{start_jobid}")
+        # Cloning the original job id hash because running the query_async_job_result updates the hash to include
+        # more than just the job id (which I could work around, but I'm lazy).
+        jobid = start_jobid.clone
 
         server_start = compute.query_async_job_result(jobid)
-        while server_start['queryasyncjobresultresponse'].fetch('jobstatus') == 0
+        # jobstatus of zero is a running job
+        while server_start['queryasyncjobresultresponse'].fetch('jobstatus').to_i == 0
+          debug("Job status: #{server_start}")
           print ". "
           sleep(10)
+          debug("Running Job ID #{jobid}")
+          debug("Start Job ID #{start_jobid}")
+          # We have to reclone on each iteration, as the hash keeps getting updated.
+          jobid = start_jobid.clone
           server_start = compute.query_async_job_result(jobid)
         end
         debug("Server_Start: #{server_start} \n")
 
-        if server_start['queryasyncjobresultresponse'].fetch('jobstatus') == 2
+        # jobstatus of 2 is an error response
+        if server_start['queryasyncjobresultresponse'].fetch('jobstatus').to_i == 2
           errortext = server_start['queryasyncjobresultresponse'].fetch('jobresult').fetch('errortext')
           error("ERROR! Job failed with #{errortext}")
         end
 
-        if server_start['queryasyncjobresultresponse'].fetch('jobstatus') == 1
+        # jobstatus of 1 is a succesfully completed async job
+        if server_start['queryasyncjobresultresponse'].fetch('jobstatus').to_i == 1
           server_info = server_start['queryasyncjobresultresponse']['jobresult']['virtualmachine']
           debug(server_info)
           print "(server ready)"
@@ -162,9 +176,9 @@ module Kitchen
 
       def destroy(state)
         return if state[:server_id].nil?
-
-        server = compute.servers.get(state[:server_id])
-        compute.destroy_virtual_machine(state[:server_id]) unless server.nil?
+        debug("Destroying #{state[:server_id]}")
+        server = compute.servers.get({'id' => state[:server_id]})
+        compute.destroy_virtual_machine({'id' => state[:server_id]}) unless server.nil?
         info("CloudStack instance <#{state[:server_id]}> destroyed.")
         state.delete(:server_id)
         state.delete(:hostname)

data/lib/kitchen/driver/cloudstack_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Cloudstack Kitchen driver
-    CLOUDSTACK_VERSION = "0.10.0"
+    CLOUDSTACK_VERSION = "0.20.0.pre"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.20.0.pre
 platform: ruby
 authors:
 - Jeff Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.24'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.24'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -168,9 +168,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -179,4 +179,3 @@ specification_version: 4
 summary: Provides an interface for Test Kitchen to be able to run jobs against an
   Apache CloudStack cloud.
 test_files: []
-has_rdoc: