chef-provisioning-opennebula 0.4.3 → 0.4.4

data/spec/recipes/OneDriver/instantiate_one_template_spec.rb

@@ -0,0 +1,25 @@
+# Copyright 2016, BlackBerry, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'chef/provisioning/opennebula_driver'
+require "#{File.dirname(__FILE__)}/../../config.rb"
+
+machine 'OpenNebula-tpl-1-vm' do
+  machine_options MACHINE_OPTIONS.merge(
+    :bootstrap_options => {
+      :template_name => 'OpenNebula-test-tpl'
+    }
+  )
+  run_list []
+end

data/spec/recipes/OneDriver/snapshot_one_image_spec.rb

@@ -0,0 +1,21 @@
+# Copyright 2016, BlackBerry, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'chef/provisioning/opennebula_driver'
+
+one_image 'OpenNebula-snap-1-img' do
+  machine_id 'OpenNebula-bootstrap-vm'
+  disk_id 'OpenNebula-bootstrap-img'
+  action :snapshot
+end

data/spec/recipes/OneDriver/snapshot_two_image_spec.rb

@@ -0,0 +1,21 @@
+# Copyright 2016, BlackBerry, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'chef/provisioning/opennebula_driver'
+
+one_image 'OpenNebula-snap-2-img' do
+  machine_id 'OpenNebula-bootstrap-vm'
+  disk_id 'OpenNebula-bootstrap-img'
+  action :snapshot
+end

data/spec/recipes/driver_options_spec.rb

@@ -1,70 +1,27 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry, Inc.
 #
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
 #   http://www.apache.org/licenses/LICENSE-2.0
 #
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 require 'chef/provisioning/opennebula_driver'
+require 'fileutils'
+require "#{File.dirname(__FILE__)}/../config.rb"
 
-endpoint = "#{ENV['ONE_XMLRPC']}".dup
-home = "#{ENV['HOME']}".dup
-auth = File.read(ENV['ONE_AUTH'])
-httpbase = "#{ENV['ONE_HTTPBASE']}".dup
-chef_repo_path = "#{ENV['CHEF_REPO_PATH']}".dup
+FileUtils.mkdir_p(CHEF_REPO_PATH.chomp('/'))
+with_chef_local_server :chef_repo_path => CHEF_REPO_PATH.chomp('/')
+with_driver((ONE_XMLRPC[0, 11] == 'opennebula:' ? ONE_XMLRPC : 'opennebula:' + ONE_XMLRPC).chomp('/'))
 
-with_driver "opennebula:#{endpoint}",
-   :credentials => "#{auth}"
-
-with_machine_options :bootstrap_options => {
-  :template => {
-      "HTTPBASE" => "#{httpbase}",
-      "MEMORY" => "2048",
-      "CPU" => "1",
-      "VCPU" => "1",
-      "OS" => {
-        "ARCH" => "x86_64"
-      },
-      "DISK" => {
-        "IMAGE" => "Ubuntu-12.04.5-pre-prod-20141216",
-        "IMAGE_UNAME" => "m_plumb",
-        "DRIVER" => "qcow2"
-      },
-      "NIC" => {
-        "NETWORK" => "PUB-52-10.236",
-        "NETWORK_UNAME" => "neutrino"
-      },
-      "GRAPHICS" => {
-        "LISTEN" => "0.0.0.0",
-        "TYPE" => "vnc"
-      },
-      "CONTEXT" => {
-        "NETWORK" => "YES",
-        "HOSTNAME" => "$NAME",
-        "INSTALL_CHEF_CLIENT_COMMAND" => "dpkg -E -i /mnt/chef-client.deb",
-        "SSH_USER" => 'local',
-        "SSH_PUBLIC_KEY" => File.read("#{home}/.ssh/id_rsa.pub").strip,
-        "FILES" => "$HTTPBASE/01_chef $HTTPBASE/../chef-client.deb"
-      }
-    }
-  },
-  :ssh_user => 'local',
-  :ssh_options => {
-    :keys_only => false,
-    :forward_agent => true,
-    :use_agent => true,
-    :user_known_hosts_file => '/dev/null'
-  },
-  :ssh_execute_options => {
-    :prefix => 'sudo '
-  },
-  :cached_installer => true
-  
-with_chef_local_server :chef_repo_path => "#{chef_repo_path}"
+with_machine_options MACHINE_OPTIONS.merge(
+  :bootstrap_options => {
+    :template => VM_TEMPLATE
+  }
+)

data/spec/spec_helper.rb

@@ -1,16 +1,16 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry, Inc.
 #
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
 #   http://www.apache.org/licenses/LICENSE-2.0
 #
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 require 'chef/dsl/recipe'
 require 'chef/mixin/shell_out'
@@ -21,15 +21,43 @@ require 'chef/run_context'
 require 'cheffish/rspec/matchers'
 require 'opennebula'
 require 'support/opennebula_support'
+require 'fileutils'
+
+def test_helper(context, recipe, expected, error = nil)
+  context context do
+    it { is_expected.to converge_test_recipe(recipe, expected, error) }
+  end
+  context "[SKIP] #{context}" do
+    it { is_expected.to converge_test_recipe(recipe, :idempotent, error) }
+  end
+end
+
+def cleanup
+  chef_run(%w(
+    OneDriver/delete/OpenNebula-test-tpl.rb
+    OneDriver/delete/OpenNebula-test-tpl-ints.rb
+    OneDriver/delete/OpenNebula-tpl-1-vm.rb
+    OneDriver/delete/OpenNebula-bootstrap-vm.rb
+    OneDriver/delete/OpenNebula-bootstrap-img.rb
+    OneDriver/delete/OpenNebula-back-1-vm.rb
+    OneDriver/delete/OpenNebula-back-2-vm.rb
+    OneDriver/delete/OpenNebula-snap-1-img.rb
+    OneDriver/delete/OpenNebula-snap-2-img.rb
+  ))
+end
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.add_setting :log_dir, :default => "test-results/#{Time.now.strftime('%Y%m%d_%H%M%S')}"
   config.before(:suite) do
-    Dir.mkdir("test-results") unless Dir.exists?("test-results")
-    Dir.glob("test-results/*").each do |file|
-      File.delete(file)
-    end
-    delete_all
+    FileUtils.rm_rf(config.log_dir)
+    FileUtils.mkdir_p(config.log_dir)
+    FileUtils.rm_rf('nodes')
+    fail 'Quick cleanup before testing failed.' unless cleanup.include?('Chef Client finished')
+  end
+  config.after(:suite) do
+    FileUtils.rm_rf('nodes')
+    fail 'Quick cleanup after testing failed.' unless cleanup.include?('Chef Client finished')
   end
 end

data/spec/support/opennebula_support.rb

@@ -1,64 +1,99 @@
-# Copyright 2015, BlackBerry, Inc.
+# Copyright 2016, BlackBerry, Inc.
 #
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
 #   http://www.apache.org/licenses/LICENSE-2.0
 #
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 require 'cheffish/rspec/chef_run_support'
 require 'cheffish/rspec/matchers'
 require 'chef/provisioning/opennebula_driver'
+require 'fileutils'
 
 def chef_run(recipe)
-  chef_client = Mixlib::ShellOut.new("bundle exec chef-client -z ./spec/recipes/driver_options_spec.rb ./spec/recipes/#{recipe} --force-formatter", shellout_options({:timeout => 900}))
+  recipe_array = recipe.is_a?(Array) ? recipe : [recipe]
+  chef_client = Mixlib::ShellOut.new(
+    "bundle exec chef-client -z ./spec/recipes/driver_options_spec.rb #{recipe_array.map { |r| './spec/recipes/' + r }.join(' ')} --force-formatter",
+    shellout_options(:timeout => 900)
+  )
   chef_client.run_command
   chef_client.stdout
 end
 
 def shellout_options(options = {})
-  default_options = { :live_stream => STDOUT }
-  default_options.merge(options)
+  { :live_stream => STDOUT }.merge(options)
 end
 
-def delete_all
-  chef_run("delete_all_spec.rb")
+def format_error(msg)
+  "================================================================================\n#{msg}\n================================================================================"
 end
 
-# checks for runtime / idempotency-related errors in the stdout
-def check_for_error(recipe, stdout, expected = nil, error = nil)
-  if stdout.include?("RuntimeError:")
-    return (stdout.split("RuntimeError:").last).split("\n").first
-  elsif stdout.include?("NoMethodError:")
-    return (stdout.split("NoMethodError:").last).split("\n").first
+# gets runtime / idempotency-related errors from stdout
+def get_error(stdout, expected = nil, error = nil)
+  err = stdout.include?('Chef Client finished') ? nil : "Chef run did not report 'Chef Client finished', no errors were detected."
+
+  unless error.nil?
+    case error
+    when Regexp
+      return "stdout matched:\n#{error}" if stdout =~ error
+    when String
+      return "stdout included:\n#{error}" if stdout.include?(error)
+    end
   end
-  return nil if expected and stdout.include?(expected)
-  if recipe == "delete_all_spec.rb"
-    error_message = "A resource failed to delete successfully." if error and stdout.include?(error)
-  else
-    error_message = error if error and stdout.include?(error)
+
+  if stdout.include?('RuntimeError: ')
+    return "RuntimeError\n" + (stdout.split('RuntimeError: ').last).split("\n").first
+  elsif stdout.include?('NoMethodError: ')
+    return "NoMethodError\n" + (stdout.split('NoMethodError: ').last).split("\n").first
+  elsif stdout.include?('ERROR: ') && err
+    return "ERROR\n" + (stdout.split('ERROR: ').last).split("\n").first
+  elsif stdout.include?('FATAL: ')
+    return "FATAL\nAn unknown fatal error has occurred."
   end
-  error_message
+
+  return err if expected.nil?
+
+  case expected
+  when Symbol
+    fail "The only symbol supported for 'expected' is :idempotent, you passed :#{expected}" unless expected == :idempotent
+    return 'Chef run did not idempotently skip when it should have.' unless stdout.include?('(up to date)')
+  when Regexp
+    return "Chef run idempotently skipped when it should not have.\nIf you intended for it to skip, pass in :idempotent as 'expected' instead." if stdout.include?('(up to date)')
+    return "No match in stdout for:\n#{expected}" unless stdout =~ expected
+  when String
+    return "Chef run idempotently skipped when it should not have.\nIf you intended for it to skip, pass in :idempotent as 'expected' instead." if stdout.include?('(up to date)')
+    return "stdout did not include:\n#{expected}" unless stdout.include?(expected)
+  end
+
+  err
 end
 
-RSpec::Matchers.define :"converge_test_recipe" do |recipe, expected, error|
-  match do |recipe|
+RSpec::Matchers.define :converge_test_recipe do |recipe = nil, expected = :idempotent, error = nil|
+  fail 'All tests require a recipe.' if recipe.nil?
+  match do
     stdout = chef_run(recipe)
     # logs each chef run
-    File.open("./test-results/#{File.basename(recipe, '.*')}_stdout.log", "w+") { |file| file.write(stdout) }    
-    @error_message = check_for_error(recipe, stdout, expected, error)
+    dir = RSpec.configuration.log_dir + '/' + File.dirname(recipe)
+    FileUtils.mkdir_p(dir)
+    log_basename = expected == :idempotent ? File.basename(recipe, '.*') + '__i' : File.basename(recipe, '.*')
+    File.open("./#{dir}/#{log_basename}_stdout.log", 'w+') { |file| file.write(stdout) }
+    @error_message = get_error(stdout, expected, error)
+    @error_message = format_error(@error_message) unless @error_message.nil?
     # copies the stacktrace for tests that have failed
-    File.open("./test-results/#{File.basename(recipe, '.*')}_stacktrace.out", "w+") { |file| file.write(File.read("#{ENV['HOME']}/.chef/local-mode-cache/cache/chef-stacktrace.out")) } if @error_message
-    failed = true if @error_message
-    !failed
+    FileUtils.cp(
+      "#{ENV['HOME']}/.chef/local-mode-cache/cache/chef-stacktrace.out",
+      "./#{dir}/#{log_basename}_stacktrace.out"
+    ) unless @error_message.nil?
+    @error_message.nil?
   end
   failure_message do
     @error_message
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-opennebula
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Andrew J. Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -123,23 +123,33 @@ files:
 - lib/chef/resource/one_user.rb
 - lib/chef/resource/one_vnet.rb
 - lib/chef/resource/one_vnet_lease.rb
+- spec/config_sample.rb
 - spec/integration/test_all_integration_spec.rb
-- spec/recipes/attach_back_one_vm_spec.rb
-- spec/recipes/attach_back_two_vm_spec.rb
-- spec/recipes/attach_one_image_spec.rb
-- spec/recipes/converge_back_one_vm_spec.rb
-- spec/recipes/converge_back_two_vm_spec.rb
-- spec/recipes/converge_bootstrap_vm_spec.rb
-- spec/recipes/create_back_one_vm_spec.rb
-- spec/recipes/create_back_two_vm_spec.rb
-- spec/recipes/create_bootstrap_vm_spec.rb
-- spec/recipes/create_one_image_spec.rb
-- spec/recipes/create_one_template_spec.rb
-- spec/recipes/delete_all_spec.rb
+- spec/recipes/OneDriver/attach_back_one_vm_spec.rb
+- spec/recipes/OneDriver/attach_back_two_vm_spec.rb
+- spec/recipes/OneDriver/attach_one_image_spec.rb
+- spec/recipes/OneDriver/converge_back_one_vm_spec.rb
+- spec/recipes/OneDriver/converge_back_two_vm_spec.rb
+- spec/recipes/OneDriver/converge_bootstrap_vm_spec.rb
+- spec/recipes/OneDriver/create_back_one_vm_spec.rb
+- spec/recipes/OneDriver/create_back_two_vm_spec.rb
+- spec/recipes/OneDriver/create_bootstrap_vm_spec.rb
+- spec/recipes/OneDriver/create_one_image_spec.rb
+- spec/recipes/OneDriver/create_one_template_int_spec.rb
+- spec/recipes/OneDriver/create_one_template_spec.rb
+- spec/recipes/OneDriver/delete/OpenNebula-back-1-vm.rb
+- spec/recipes/OneDriver/delete/OpenNebula-back-2-vm.rb
+- spec/recipes/OneDriver/delete/OpenNebula-bootstrap-img.rb
+- spec/recipes/OneDriver/delete/OpenNebula-bootstrap-vm.rb
+- spec/recipes/OneDriver/delete/OpenNebula-snap-1-img.rb
+- spec/recipes/OneDriver/delete/OpenNebula-snap-2-img.rb
+- spec/recipes/OneDriver/delete/OpenNebula-test-tpl-ints.rb
+- spec/recipes/OneDriver/delete/OpenNebula-test-tpl.rb
+- spec/recipes/OneDriver/delete/OpenNebula-tpl-1-vm.rb
+- spec/recipes/OneDriver/instantiate_one_template_spec.rb
+- spec/recipes/OneDriver/snapshot_one_image_spec.rb
+- spec/recipes/OneDriver/snapshot_two_image_spec.rb
 - spec/recipes/driver_options_spec.rb
-- spec/recipes/instantiate_one_template_spec.rb
-- spec/recipes/snapshot_one_image_spec.rb
-- spec/recipes/snapshot_two_image_spec.rb
 - spec/spec_helper.rb
 - spec/support/opennebula_support.rb
 homepage: https://github.com/blackberry/chef-provisioning-opennebula

data/spec/recipes/attach_back_one_vm_spec.rb

@@ -1,20 +0,0 @@
-# Copyright 2015, BlackBerry, Inc.
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
-
-require 'chef/provisioning/opennebula_driver'
-
-one_image "OpenNebula-snap-1-img" do
- machine_id 'OpenNebula-back-1-vm'
- action :attach
-end