kitchen-opennebula 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 952184d163c45c32a2a238a231ec2f06f197e104
-  data.tar.gz: 416bea360b1a26c48320fbbd80c76642fdb2a2e4
+  metadata.gz: 4643133b424f45bd40a1c7dca4bfcb422e0e2b48
+  data.tar.gz: f55a4c362814f33108361087611a492d0c1b8db3
 SHA512:
-  metadata.gz: e3123a8611a73deda4e2bc296e9ccca3d8aa807294836a5088eef39ef98fbc9fe8384b3b69c768b4ac31033b5e31ac4165a9402f65eac15b9f5b65713be441ac
-  data.tar.gz: 9c504d723301c80e3cc5ebfcf5fd8afa09c7ff2f3274fdb41685b4b99d6b9f20231ad00484883247ea7e982c422bdf80baab01e7cbb8fa5c31c6cb14f48f7c21
+  metadata.gz: 40726c75ea943f1d3de2d8c4c5a40bd8460914d7395d3d385283a8df21e49ebbacfffd38a9949dd34eb838c54a90add6f78214b179ffb1cfbde4ef82b3e737d9
+  data.tar.gz: b5ce1b7330d0801edbbec218688a39007ff2d279da7c3516a505766feb36d933c2927efbec93290f23931ee51570c9a33038bd5da0fcda8548f5635b3090f2c2

data/.gitignore

@@ -1 +1,4 @@
 .project
+.idea
+Gemfile.lock
+pkg

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.3
+
+* add random string to instance name
+* allow specifying cpu for box
+* use documented ONE_AUTH key
+* keep lower bound of requirement to '>= 4.10'
+
 ## 0.2.2
 
 * Restrict opennebula gem dependency version to be '~> 4.10', '< 5'.

data/Rakefile

@@ -1,10 +1,12 @@
-require "bundler/gem_tasks"
+require 'bundler'
+require 'bundler/gem_tasks'
 require 'cane/rake_task'
 require 'tailor/rake_task'
 
 desc "Run cane to check quality metrics"
 Cane::RakeTask.new do |cane|
-  cane.canefile = './.cane'
+  cane.abc_max = 80
+  cane.style_measure = 120
 end
 
 Tailor::RakeTask.new
@@ -16,6 +18,6 @@ task :stats do
 end
 
 desc "Run all quality tasks"
-task :quality => [:cane, :tailor, :stats]
+task :quality => [:cane, :tailor]
 
 task :default => [:quality]

data/kitchen-opennebula.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'test-kitchen', '~> 1.2'
   spec.add_dependency 'fog', '~> 1.30'
-  spec.add_dependency 'opennebula', '~> 4.10', '< 5'
+  spec.add_dependency 'opennebula', '>= 4.10'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/kitchen/driver/opennebula.rb

@@ -34,7 +34,8 @@ module Kitchen
         ENV.fetch('ONE_AUTH', "#{ENV['HOME']}/.one/one_auth")
 
       default_config :vm_hostname do |driver|
-        "#{driver.instance.name}"
+        randstr = 8.times.collect{[*'a'..'z',*('0'..'9')].sample}.join
+        "#{driver.instance.name}-#{randstr}"
       end
 
       default_config :public_key_path do
@@ -48,6 +49,8 @@ module Kitchen
 
       default_config :username, 'local'
       default_config :memory, 512
+      default_config :vcpu, 1
+      default_config :cpu, 1
       default_config :user_variables, { }
       default_config :context_variables, { }
 
@@ -56,7 +59,7 @@ module Kitchen
       default_config :no_ssh_tcp_check_sleep, 120
       default_config :no_passwordless_sudo_check, false
       default_config :no_passwordless_sudo_sleep, 120
-      
+
       def initialize(config)
         super
         Fog.timeout = config[:wait_for].to_i
@@ -68,14 +71,14 @@ module Kitchen
         # Ensure we can authenticate with OpenNebula
         rc = conn.client.get_version
         raise(rc.message) if OpenNebula.is_error?(rc)
-        
+
         # Check if VM is already created.
         if state[:vm_id] && !conn.list_vms({:id => state[:vm_id]}).empty?
           info("OpenNebula instance #{instance.to_str} already created.")
           return
         end
-   
-        if config[:template_id].nil? and config[:template_name].nil? 
+
+        if config[:template_id].nil? and config[:template_name].nil?
           raise "template_name or template_id not specified in .kitchen.yml"
         elsif !config[:template_id].nil? and !config[:template_name].nil?
           raise "Only one of template_name or template_id should be specified in .kitchen.yml"
@@ -100,12 +103,12 @@ module Kitchen
           raise "Could not find template to create VM. -- Verify your template filters and one_auth credentials"
         end
         newvm.name = config[:vm_hostname]
-        
+
         newvm.flavor.user_variables = {} if newvm.flavor.user_variables.nil? || newvm.flavor.user_variables.empty?
         config[:user_variables].each do |key, val|
           newvm.flavor.user_variables[key.to_s] = val
         end
-        
+
         newvm.flavor.context = {} if newvm.flavor.context.nil? || newvm.flavor.context.empty?
         newvm.flavor.context['SSH_PUBLIC_KEY'] = File.read(config[:public_key_path]).chomp
         newvm.flavor.context['TEST_KITCHEN'] = "YES"
@@ -114,7 +117,9 @@ module Kitchen
           newvm.flavor.context[key.to_s] = val
         end
         newvm.flavor.memory = config[:memory]
-       
+        newvm.flavor.vcpu = config[:vcpu]
+        newvm.flavor.cpu = config[:cpu]
+
         # TODO: Set up NIC and disk if not specified in template
         vm = newvm.save
         vm.wait_for { ready? }
@@ -131,7 +136,7 @@ module Kitchen
         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)
         if config[:no_passwordless_sudo_check]
           sleep(config[:no_passwordless_sudo_sleep])
@@ -140,7 +145,7 @@ module Kitchen
         end
         debug("Passwordless sudo ready on #{instance.to_str}")
       end
-      
+
       def wait_for_passwordless_sudo(state)
         retries = config[:passwordless_sudo_timeout] || 300
         retry_interval = config[:passwordless_sudo_retry_interval] || 10
@@ -156,7 +161,7 @@ module Kitchen
           raise ActionFailed, e.message
         end
       end
-      
+
       def converge(state)
         super
       end
@@ -172,9 +177,15 @@ module Kitchen
 
       protected
 
-      def opennebula_connect()        
+      def opennebula_connect()
         opennebula_creds = nil
-        if File.exists?(config[:oneauth_file])
+        if ENV.has_key?('ONE_AUTH')
+          if File.exist?(ENV['ONE_AUTH'])
+            opennebula_creds = File.read(ENV['ONE_AUTH'])
+          else
+            opennebula_creds = ENV['ONE_AUTH']
+          end
+        elsif File.exist?(config[:oneauth_file])
           opennebula_creds = File.read(config[:oneauth_file])
         else
           raise ActionFailed, "Could not find one_auth file #{config[:oneauth_file]}"

data/lib/kitchen/driver/opennebula_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-opennebula
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Andrew J. Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -42,22 +42,16 @@ dependencies:
   name: opennebula
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,9 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Opennebula
 test_files: []
-has_rdoc: