kitchen-cloudstack 0.23.1 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13e8ac436a5672b402155df02af8bd06df527048cc9cc3482bb588e8c7cdac7
-  data.tar.gz: d56d3d78de030a6159a837f8f7fbc12888cdcfb28bf4e7ed75f6366885a04167
+  metadata.gz: 04aeb36b6e242b492ce5d28216f9daa7667797dd8989c1c520384db1c87c2ac4
+  data.tar.gz: dac1ca7486c4cbc23737b453a1072cc4227b8f8d7807434c33d0fe45956eb03a
 SHA512:
-  metadata.gz: 1051722e1f22791d9d00ffa103e0b9e314a97576987c213e142ee6b1f27002a1017f20fe011a7be8c54b8c0ef84bcb900f2584dbf8aed50622ba5ecabe234d51
-  data.tar.gz: f79fc8cc35c5fc18b7219f31d2a8c7e62a75f8f7b07237b60eb6d873ab2417f08464e6907f28023e624eca18c64a2b568bf6d70f076e68bc0ee3aa440d11e597
+  metadata.gz: c972655223df9ac9b0b1a7c594310114fac21ae63cf5b1085c401e6053de14f53576d3fd3b247f98d30f37d151dba750ba288a1a47b006c7f93bfdf5cff2d687
+  data.tar.gz: 74db868891dbdb72203307f76b757277344fa1433f9ff2a5d81a072f79d130fbcec367a1f942468f1c591a16469d90e783a930d8dadd5ae360eb7d674b93ff67

data/README.md

@@ -28,6 +28,7 @@ Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
       cloudstack_project_id: [PROJECT_ID] # To deploy VMs into project.
       cloudstack_vm_public_ip: [PUBLIC_IP] # In case you use advanced networking and do static NAT manually.
       associate_public_ip: [TRUE/FALSE] # If you want kitchen to automatically associate a public IP, default false.
+      cloudstack_create_firewall_rule: [TRUE/FALSE] # If you want Kitchen to automatically create firewall rule for public IP to reach SSH (port 22)
       cloudstack_userdata: "#cloud-config\npackages:\n - htop\n" # double quote required.
 
 Then to specify different OS templates,

data/kitchen-cloudstack.gemspec

@@ -11,21 +11,20 @@ Gem::Specification.new do |spec|
   spec.description   = %q{A Test Kitchen Driver for Apache CloudStack}
   spec.summary       = %q{Provides an interface for Test Kitchen to be able to run jobs against an Apache CloudStack cloud.}
   spec.homepage      = 'https://github.com/test-kitchen/kitchen-cloudstack'
-  spec.license       = 'Apache 2.0'
+  spec.license       = 'Apache-2.0'
 
   spec.files         = `git ls-files`.split($/)
-  spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   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 'test-kitchen', '>= 1.0.0', "< 3"
+  spec.add_dependency 'fog', '~> 1.23'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
 
   spec.add_development_dependency 'cane', '~> 2'
   spec.add_development_dependency 'tailor', '~> 1'
-  spec.add_development_dependency 'countloc', '~> 0'
-  spec.add_development_dependency 'pry', '~> 0'
+  spec.add_development_dependency 'countloc'
+  spec.add_development_dependency 'pry'
 end

data/lib/kitchen/driver/cloudstack.rb

@@ -33,6 +33,7 @@ module Kitchen
       default_config :username,         'root'
       default_config :port,             '22'
       default_config :password,         nil
+      default_config :cloudstack_create_firewall_rule, false
 
       def compute
         cloudstack_uri =  URI.parse(config[:cloudstack_api_url])
@@ -323,10 +324,42 @@ module Kitchen
         job_status = compute.query_async_job_result(res['associateipaddressresponse']['jobid'])
         if job_status['queryasyncjobresultresponse'].fetch('jobstatus').to_i == 1
           save_ipaddress_id(state, job_status)
-          get_public_ip(res['associateipaddressresponse']['id'])
+          ip_address = get_public_ip(res['associateipaddressresponse']['id'])
         else
           error(job_status['queryasyncjobresultresponse'].fetch('jobresult'))
         end
+
+        if config[:cloudstack_create_firewall_rule]
+          info("Creating firewall rule for SSH")
+          # create firewallrule projectid=<project> cidrlist=<0.0.0.0/0 or your source> protocol=tcp startport=0 endport=65535 (or you can restrict to 22 if you want) ipaddressid=<public ip address id>
+          options = {
+            'projectid' => config[:cloudstack_project_id],
+            'cidrlist' => '0.0.0.0/0',
+            'protocol' => 'tcp',
+            'startport' => 22,
+            'endport' => 22,
+            'ipaddressid' => state[:ipaddressid]
+          }
+          res = compute.create_firewall_rule(options)
+          status = 0
+          timeout = 10
+          while status == 0
+            job_status = compute.query_async_job_result(res['createfirewallruleresponse']['jobid'])
+            status = job_status['queryasyncjobresultresponse'].fetch('jobstatus').to_i
+            timeout -= 1
+            error("Failed to create firewall rule by timeout") if timeout == 0
+            sleep 1
+          end
+
+          if job_status['queryasyncjobresultresponse'].fetch('jobstatus').to_i == 1
+            save_firewall_rule_id(state, job_status)
+            info('Firewall rule successfully created')
+          else
+            error(job_status['queryasyncjobresultresponse'])
+          end
+        end
+
+        ip_address
       end
 
       def create_port_forward(state, virtualmachineid)
@@ -359,6 +392,21 @@ module Kitchen
             error("Error disassociating public ip")
           end
         end
+
+        if state[:firewall_rule_id]
+          info("Removing firewall rule '#{state[:firewall_rule_id]}'")
+
+          begin
+            res = compute.delete_firewall_rule(state[:firewall_rule_id])
+          rescue Fog::Compute::Cloudstack::BadRequest => e
+            error(e) unless e.to_s.match?(/does not exist/)
+          else
+            job_status = compute.query_async_job_result(res['deletefirewallruleresponse']['jobid'])
+            unless job_status['queryasyncjobresultresponse'].fetch('jobstatus').to_i == 0
+              error("Error removing firewall rule '#{state[:firewall_rule_id]}'")
+            end
+          end
+        end
       end
 
       def delete_port_forward(state)
@@ -393,6 +441,13 @@ module Kitchen
                                 .fetch('id')
       end
 
+      def save_firewall_rule_id(state, job_status)
+        state[:firewall_rule_id] = job_status['queryasyncjobresultresponse']
+                                .fetch('jobresult')
+                                .fetch('firewallrule')
+                                .fetch('id')
+      end
+
       def save_forwarding_port_rule_id(state, uuid)
         state[:forwardingruleid] = uuid
       end

data/lib/kitchen/driver/cloudstack_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Cloudstack Kitchen driver
-    CLOUDSTACK_VERSION = "0.23.1"
+    CLOUDSTACK_VERSION = "0.23.2"
   end
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.23.2
 platform: ruby
 authors:
 - Jeff Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-06 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.23'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,35 +44,32 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.23'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -110,28 +104,28 @@ dependencies:
   name: countloc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Test Kitchen Driver for Apache CloudStack
@@ -155,7 +149,7 @@ files:
 - lib/kitchen/driver/cloudstack_version.rb
 homepage: https://github.com/test-kitchen/kitchen-cloudstack
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -173,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Provides an interface for Test Kitchen to be able to run jobs against an