kitchen-opennebula 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 545f5bb2c0058823f7682d1aeaf6dde47e390950
-  data.tar.gz: 44bcb4d0c4c44a440fd7ab767404326f1c8d35d8
+  metadata.gz: 5dea4bf5542ab00226332f544663f1615a7592d3
+  data.tar.gz: ce2459bde699197ac5f16cba5939c1d05f8c68e8
 SHA512:
-  metadata.gz: e79c21812616427f1b7ae57f27b30d0d58517f1e4a848699e59c40ccf3435dd3ee082de8c317a63c698b86cd9c2e4a1ce8191a6c54dfb9ebf931bd0c67921c28
-  data.tar.gz: 43f0ca7a7e9ef1c3a3aee3eeb32cfc4ac3ec7c6110cd9dff1a413bda589788bfe668504e95dc3e6f6f74cd43c05af73b1a19b051320ce7657d33011fa48534a9
+  metadata.gz: e1d44b88eec480dd34de142506fdb3b21afe217ea322bcdf5725a91b657a1033c96e7e20695691d1f9bf19976973331ca33e2721132da1eee22ccff243546f54
+  data.tar.gz: 449ccd4981a98adf07f985f132a74d647f745a9876a9e2e067e596b5b51c09f82da1d9ee8a08c587d940ae5128fbcb77a4c55db9cf28a43325ff3b59130fce6e

data/CHANGELOG.md

@@ -1,3 +1,15 @@
-## 0.1.0 / Unreleased
+## 0.2.1
+
+* Do not use methods from Kitchen::SSHBase as we are no longer inherit them. Rely on instance.transport instead.
+
+## 0.2.0
+
+* Switch SSH api to use gateway-enabled wrapper, instead of raw Kitchen::SSH, which does not support ssh gateways.
+
+## 0.1.2
+
+* Adds an authentication check for OpenNebula, and uses a later version of fog which supports multiple NICs in a VM template.
+
+## 0.1.0
 
 * Initial release

data/lib/kitchen/driver/opennebula.rb

@@ -26,7 +26,7 @@ module Kitchen
     # Opennebula driver for Kitchen.
     #
     # @author Andrew J. Brown <anbrown@blackberry.com>
-    class Opennebula < Kitchen::Driver::SSHBase
+    class Opennebula < Kitchen::Driver::Base
       default_config :opennebula_endpoint,
         ENV.fetch('ONE_XMLRPC', 'http://127.0.0.1:2633/RPC2')
 
@@ -127,32 +127,33 @@ module Kitchen
       end
 
       def tcp_check(state)
-        wait_for_sshd(state[:hostname]) unless config[:no_ssh_tcp_check]
+        instance.transport.connection(state).wait_until_ready unless config[:no_ssh_tcp_check]
         sleep(config[:no_ssh_tcp_check_sleep]) if config[:no_ssh_tcp_check]
         debug("SSH ready on #{instance.to_str}")
       end
       
       def passwordless_sudo_check(state)
-        wait_for_passwordless_sudo(state) unless config[:no_passwordless_sudo_check]
-        sleep(config[:no_passwordless_sudo_sleep]) if config[:no_passwordless_sudo_check]
+        if config[:no_passwordless_sudo_check]
+          sleep(config[:no_passwordless_sudo_sleep])
+        else
+          wait_for_passwordless_sudo(state)
+        end
         debug("Passwordless sudo ready on #{instance.to_str}")
       end
       
       def wait_for_passwordless_sudo(state)
-        Kitchen::SSH.new(*build_ssh_args(state)) do |conn|
-          retries = config[:passwordless_sudo_timeout] || 300
-          retry_interval = config[:passwordless_sudo_retry_interval] || 10
-          begin
-            logger.info("Waiting #{retries.to_s} seconds for #{config[:username]} user to be granted passwordless sudo on #{state[:hostname]}...")
-            retries -= retry_interval
-            run_remote("sudo -n true", conn)
-          rescue ActionFailed => e
-            if (e.message.eql? "SSH exited (1) for command: [sudo -n true]") && (retries >= 0)
-              sleep retry_interval
-              retry
-            end
-            raise ActionFailed, e.message
-          end        
+        retries = config[:passwordless_sudo_timeout] || 300
+        retry_interval = config[:passwordless_sudo_retry_interval] || 10
+        begin
+          instance.transport.connection(state) do |conn|
+            conn.execute('sudo -n true')
+          end
+        rescue Kitchen::Transport::SshFailed => e
+          if (e.message.eql? "SSH exited (1) for command: [sudo -n true]") && (retries >= 0)
+            sleep retry_interval
+            retry
+          end
+          raise ActionFailed, e.message
         end
       end
       

data/lib/kitchen/driver/opennebula_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Opennebula Kitchen driver
-    OPENNEBULA_VERSION = "0.1.2"
+    OPENNEBULA_VERSION = "0.2.1"
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-opennebula
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew J. Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2016-08-22 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.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.30'
 - !ruby/object:Gem::Dependency
   name: opennebula
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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
   name: cane
   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: tailor
   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: 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'
 description: A Test Kitchen Driver for Opennebula
@@ -129,7 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -148,18 +148,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Opennebula
 test_files: []
+has_rdoc: