chef-provisioning-opennebula 0.4.8 → 0.4.9

data/spec/recipes/{OneFlowService/action/reboot_hard.rb → OneFlow/service_action_reboot_hard.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
-  role 'reboot_hard'
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_reboot_hard'
   action :reboot_hard
 end

data/spec/recipes/{OneFlowService/action/release.rb → OneFlow/service_action_release.rb}

@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
-  role 'release'
-  override_failsafe true
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_hold'
+  # The following setting will ignore the fact the feature is not fully tested and run it anyway
+  #override_failsafe true
   action :release
 end

data/spec/recipes/OneFlow/service_action_resume_poweroff.rb

@@ -0,0 +1,18 @@
+# Copyright 2016, BlackBerry Limited
+#
+# 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.
+
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_poweroff'
+  action :resume
+end

data/spec/recipes/OneFlow/service_action_resume_poweroff_hard.rb

@@ -0,0 +1,18 @@
+# Copyright 2016, BlackBerry Limited
+#
+# 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.
+
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_poweroff_hard'
+  action :resume
+end

data/spec/recipes/{OneFlowService/action/resume.rb → OneFlow/service_action_resume_stop.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
-  role 'suspend_resume'
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_stop'
   action :resume
 end

data/spec/recipes/OneFlow/service_action_resume_suspend.rb

@@ -0,0 +1,18 @@
+# Copyright 2016, BlackBerry Limited
+#
+# 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.
+
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_suspend'
+  action :resume
+end

data/spec/recipes/OneFlow/service_action_resume_undeploy.rb

@@ -0,0 +1,18 @@
+# Copyright 2016, BlackBerry Limited
+#
+# 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.
+
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_undeploy'
+  action :resume
+end

data/spec/recipes/OneFlow/service_action_resume_undeploy_hard.rb

@@ -0,0 +1,18 @@
+# Copyright 2016, BlackBerry Limited
+#
+# 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.
+
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_undeploy_hard'
+  action :resume
+end

data/spec/recipes/{OneFlowService/action/scale.rb → OneFlow/service_action_scale.rb}

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
-  role 'scale'
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_scale'
   cardinality 2
   action :scale
 end

data/spec/recipes/{OneFlowService/action/shutdown.rb → OneFlow/service_action_shutdown.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
-  role 'shutdown'
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_shutdown'
   action :shutdown
 end

data/spec/recipes/{OneFlowService/action/shutdown_hard.rb → OneFlow/service_action_shutdown_hard.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
-  role 'shutdown_hard'
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_shutdown_hard'
   action :shutdown_hard
 end

data/spec/recipes/{OneFlowService/action/snapshot_create.rb → OneFlow/service_action_snapshot_create.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
-  role 'snapshot_create'
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_snapshot_create'
   action :snapshot_create
 end

data/spec/recipes/{OneFlowService/action/stop.rb → OneFlow/service_action_stop.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
-  role 'stop'
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_stop'
   action :stop
 end

data/spec/recipes/{OneFlowService/action/suspend.rb → OneFlow/service_action_suspend.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
-  role 'suspend_resume'
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_suspend'
   action :suspend
 end

data/spec/recipes/{OneFlowService/action/undeploy.rb → OneFlow/service_action_undeploy.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
-  role 'undeploy'
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_undeploy'
   action :undeploy
 end

data/spec/recipes/{OneFlowService/action/undeploy_hard.rb → OneFlow/service_action_undeploy_hard.rb}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
-  role 'undeploy_hard'
+one_flow_service 'RSpec-role-action-service' do
+  role 'RSpec_undeploy_hard'
   action :undeploy_hard
 end

data/spec/recipes/{OneFlowService/action/shutdown_service.rb → OneFlow/shutdown_role_action_service.rb}

@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_service 'test_role_action' do
+one_flow_service 'RSpec-role-action-service' do
   action :shutdown
 end

data/spec/recipes/{OneFlowTemplate/update_simple_from_hash.rb → OneFlow/update_json_template.rb}

@@ -12,42 +12,45 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-one_flow_template 'test_simple_from_hash' do
+one_flow_template 'RSpec-flow-json-template' do
   template :deployment => 'none',
+           :ready_status_gate => false,
            :roles => [
              {
-               :name => 'gary_ubuntu',
+               :name => 'RSpecTest',
+               :cooldown => 2,
                :min_vms => 1,
                :max_vms => 5,
                :scheduled_policies => [
                  {
                    :type => "PERCENTAGE_CHANGE",
+                   :cooldown => 2,
                    :recurrence => "0 1 1-10 * *",
-                   :adjust => 3,
-                   :min_adjust_step => 14
+                   :adjust => 1,
+                   :min_adjust_step => 5
                  }
                ]
              },
              {
-               :name => 'gary_ubuntu_2',
-               :vm_template => 'OpenNebula-test-tpl-strings',
-               :cooldown => 123,
+               :name => 'RSpecRetest',
+               :vm_template => 'RSpec-test-template',
+               :cooldown => 2,
                :min_vms => 1,
                :max_vms => 5,
                :elasticity_policies => [
                  {
                    :type => "CHANGE",
-                   :cooldown => 17,
-                   :period => 15,
-                   :adjust => 2,
-                   :period_number => 2,
+                   :cooldown => 2,
+                   :period => 2,
+                   :adjust => 1,
+                   :period_number => 1,
                    :expression => "ATT == 20"
                  },
                  {
                    :type => "CARDINALITY",
-                   :cooldown => 14,
-                   :period => 13,
-                   :adjust => 3,
+                   :cooldown => 2,
+                   :period => 2,
+                   :adjust => 1,
                    :period_number => 1,
                    :expression => "ATT > 20"
                  }

data/spec/recipes/common.rb

@@ -29,5 +29,3 @@ with_machine_options MACHINE_OPTIONS.merge(
 one_auth = Chef::Provisioning::OpenNebulaDriver.get_onelib(
   :driver_url => DRIVER_URL
 ).client.one_auth
-
-username = one_auth.split(':').first

data/spec/spec_helper.rb

@@ -12,57 +12,112 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'chef/dsl/recipe'
-require 'chef/mixin/shell_out'
-require 'chef/platform'
-require 'chef/provisioning'
 require 'chef/provisioning/opennebula_driver'
-require 'chef/run_context'
-require 'cheffish/rspec/matchers'
-require 'support/opennebula_support'
+require 'open3'
+require 'tempfile'
 require 'fileutils'
-require_relative 'config.rb'
+require "#{File.dirname(__FILE__)}/config.rb"
 
-def idempotency_helper(context, recipe, expected = nil)
-  context context do
-    it { is_expected.to converge_test_recipe(:recipe => recipe, :expected => expected, :fail_if => '(up to date)') }
+RSpec.configure do |config|
+  config.filter_run :runme
+  config.run_all_when_everything_filtered = true
+  config.add_setting :log_dir, :default => File.join(File.expand_path('..', File.dirname(__FILE__)), 'rspec-results')
+  config.before(:suite) do
+    # Cleanup nodes and log_dir from previous run
+    FileUtils.rm_rf(File.join(File.expand_path('..', File.dirname(__FILE__)), 'nodes'))
+    FileUtils.mkdir_p(config.log_dir) unless Dir.exist?(config.log_dir)
+    Dir.entries(config.log_dir).reject{|entry| entry =~ /^\.\.?$/}.each do |f|
+      FileUtils.rm_rf(File.join(config.log_dir, f))
+    end
+    cleanup
   end
-  context "[SKIP] #{context}" do
-    it { is_expected.to converge_test_recipe(:recipe => recipe, :expected => '(up to date)', :fail_if => nil) }
+  config.after(:suite) do
+    FileUtils.rm_rf(File.join(File.expand_path('..', File.dirname(__FILE__)), 'nodes'))
   end
 end
 
-def cleanup
-  # OneDriver deletes are listed explicitly because they need to be run in a certain order.
-  cleanup_list = %w(
-    OneDriver/delete/OpenNebula-test-tpl-strings.rb
-    OneDriver/delete/OpenNebula-test-tpl-ints.rb
-    OneDriver/delete/OpenNebula-test-tpl-mix.rb
-    OneDriver/delete/OpenNebula-test-vm.rb
-    OneDriver/delete/OpenNebula-test-vm-vnet.rb
-    OneDriver/delete/OpenNebula-test-vnet.rb
-    OneDriver/delete/OpenNebula-test-img.rb
-    OneDriver/delete/OpenNebula-test-snap-img.rb
-  ).map { |f| "#{File.dirname(__FILE__)}/recipes/" + f }
-  cleanup_list += Dir["#{File.dirname(__FILE__)}/recipes/OneFlowTemplate/delete/*.rb"] unless ONE_FLOW_URL.nil?
-  cleanup_list += Dir["#{File.dirname(__FILE__)}/recipes/OneFlowService/delete/*.rb"] unless ONE_FLOW_URL.nil?
-  err = get_error(chef_run(cleanup_list, false), 'Chef Client finished', nil)
-  fail "\n\nTest suite cleanup failed\n#{err.first}\n\n" unless err.first.nil?
+RSpec::Matchers.define :converge_with_result do |expected|
+  match do |recipe|
+    recipe_file = createRecipe([File.join('./spec/recipes/', recipe)])
+    @stdout, @stderr, status = Open3.capture3('chef-client', '-z', recipe_file, '--force-formatter')
+
+    # Save stdout, stderr and stacktrace to log_dir
+    saveLogs(recipe, @stdout, @stderr)
+
+    # Evaluate outcome by looking at STDOUT
+    if status.success?
+      @stdout.scan(Regexp.union(expected)).any? ? true : false
+    else
+      false
+    end
+  end
+
+  failure_message do |recipe|
+    "expecting #{recipe} return #{expected} - instead we received:\n\n#{@stdout}\n#{@stderr}"
+  end
+
+  failure_message_when_negated do |recipe|
+    "expecting #{recipe} NOT return #{expected} - instead we received:\n\n#{@stdout}\n#{@stderr}"
+  end
 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
-    FileUtils.rm_rf(config.log_dir)
-    FileUtils.mkdir_p(config.log_dir)
-    FileUtils.rm_rf('nodes')
-    cleanup
+private
+
+# Create a temporary recipe file
+# NB - file is removed after rspec terminates
+def createRecipe(recipes_list)
+  recipes_list.unshift('./spec/recipes/common.rb')
+  file = Tempfile.new(['recipe-', '.rb'], '/tmp')
+  file << "require '#{File.dirname(__FILE__)}/config.rb'\n\n"
+  recipes_list.each do |r|
+    file << File.read(r) + "\n\n"
   end
-  config.after(:suite) do
-    FileUtils.rm_rf('nodes')
-    cleanup
-    FileUtils.rm_rf('/tmp/chef-provisioning-opennebula-rspec-recipe.rb')
+  file.close
+  file.path
+end
+
+# Save output streams and stacktrace to log files
+# Log filenames are timestamped to make then unique
+def saveLogs(recipe, stdout, stderr)
+  # Establish what filename to use for logging
+  FileUtils.mkdir_p(File.join(RSpec.configuration.log_dir, File.dirname(recipe)))
+  log_basename = File.join(RSpec.configuration.log_dir, File.dirname(recipe),
+                           File.basename(recipe, File.extname(recipe)))
+  ts = Time.now.strftime('%H-%M-%S-%4N')
+
+  # Find out if we have a stacktrace in stdout
+  st = @stdout.scan(/FATAL: Stacktrace dumped to (.*?chef-stacktrace\.out)/)
+  stacktrace = st.any? && File.exist?(st.last.join) ? File.read(st.last.join) : ''
+
+  # Write the logs
+  File.open(log_basename + ".#{ts}" + '.stdout', 'w') { |f| f.puts(stdout); f.close} unless stdout.empty?
+  File.open(log_basename + ".#{ts}" + '.stderr', 'w') { |f| f.puts(stderr); f.close} unless stderr.empty?
+  File.open(log_basename + ".#{ts}" + '.stacktrace', 'w') { |f| f.puts(stacktrace); f.close} unless stacktrace.empty?
+end
+
+# Cleanup objects created in previous run
+def cleanup
+  # List of recipes we're going to use for cleanup
+  cleanup_list = %w(
+    OneDriver/delete_one_snap-img.rb
+    OneDriver/delete_one_vm.rb
+    OneDriver/delete_one_template.rb
+    OneDriver/delete_one_img.rb
+    OneDriver/delete_one_vnet.rb
+  ).map { |f| File.join(File.dirname(__FILE__), "recipes", f) }
+  cleanup_list += Dir["#{File.dirname(__FILE__)}/recipes/OneFlow/delete_*.rb"] unless ONE_FLOW_URL.nil?
+
+  # Create temporary cleanup recipe and run it
+  recipe_file = createRecipe(cleanup_list)
+  @stdout, @stderr, status = Open3.capture3('chef-client', '-z', recipe_file, '--force-formatter')
+
+  # Save stdout, stderr and stacktrace to log_dir
+  saveLogs('cleanup.rb', @stdout, @stderr)
+
+  # Evaluate outcome by looking at STDOUT
+  if status.success?
+    raise "Cleanup attempt failed:\n\n#{@stdout}\n#{@stderr}" if @stdout.scan(/FATAL:/).any?
+  else
+    raise "Cleanup attempt failed:\n\n#{@stdout}\n#{@stderr}"
   end
 end