chef-provisioning-opennebula 0.4.4 → 0.4.6

data/spec/recipes/OneFlowTemplate/create_tpl_opts_from_file.rb

@@ -0,0 +1,30 @@
+# 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_template 'gary' do
+  template 'file:///tmp/one_rspec_test.json'
+  template_options :name => 'test_tpl_opts_from_file',
+                   :deployment => nil,
+                   :roles => [
+                     {
+                       :name => 'gary_ubuntu',
+                       :delete_role => true
+                     },
+                     {
+                       :name => 'gary_ubuntu_new',
+                       :vm_template => 'OpenNebula-test-tpl-strings'
+                     }
+                   ]
+  mode '640'
+end

data/spec/recipes/OneFlowTemplate/create_tpl_opts_from_hash.rb

@@ -0,0 +1,35 @@
+# 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_template 'gary' do
+  template :name => 'test_tpl_opts_from_hash',
+           :roles => [
+             {
+               :name => 'gary_ubuntu',
+               :vm_template => 'OpenNebula-test-tpl-strings'
+             }
+           ]
+  template_options :deployment => 'none',
+                   :roles => [
+                     {
+                       :name => 'gary_ubuntu',
+                       :delete_role => true
+                     },
+                     {
+                       :name => 'gary_ubuntu_new',
+                       :vm_template => 'OpenNebula-test-tpl-strings'
+                     }
+                   ]
+  action :create
+end

data/spec/recipes/OneFlowTemplate/delete/branch_from_one_id.rb

@@ -0,0 +1,17 @@
+# 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_template 'test_branch_from_one_id' do
+  action :delete
+end

data/spec/recipes/OneFlowTemplate/delete/branch_from_one_name.rb

@@ -0,0 +1,17 @@
+# 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_template 'test_branch_from_one_name' do
+  action :delete
+end

data/spec/recipes/OneFlowTemplate/delete/role_action_instance.rb

@@ -0,0 +1,17 @@
+# 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_template 'test_role_action_instance' do
+  action :delete
+end

data/spec/recipes/OneFlowTemplate/delete/simple_from_file.rb

@@ -0,0 +1,17 @@
+# 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_template 'test_simple_from_file' do
+  action :delete
+end

data/spec/recipes/OneFlowTemplate/delete/simple_from_hash.rb

@@ -0,0 +1,17 @@
+# 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_template 'test_simple_from_hash' do
+  action :delete
+end

data/spec/recipes/OneFlowTemplate/delete/simple_from_web.rb

@@ -0,0 +1,17 @@
+# 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_template 'test_simple_from_web' do
+  action :delete
+end

data/spec/recipes/OneFlowTemplate/delete/simple_instance_tpl.rb

@@ -0,0 +1,17 @@
+# 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_template 'test_simple_instance_tpl' do
+  action :delete
+end

data/spec/recipes/OneFlowTemplate/delete/tpl_opts_from_file.rb

@@ -0,0 +1,17 @@
+# 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_template 'test_tpl_opts_from_file' do
+  action :delete
+end

data/spec/recipes/OneFlowTemplate/delete/tpl_opts_from_hash.rb

@@ -0,0 +1,17 @@
+# 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_template 'test_tpl_opts_from_hash' do
+  action :delete
+end

data/spec/recipes/OneFlowTemplate/update_simple_from_hash.rb

@@ -0,0 +1,57 @@
+# 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_template 'test_simple_from_hash' do
+  template :deployment => 'none',
+           :roles => [
+             {
+               :name => 'gary_ubuntu',
+               :min_vms => 1,
+               :max_vms => 5,
+               :scheduled_policies => [
+                 {
+                   :type => "PERCENTAGE_CHANGE",
+                   :recurrence => "0 1 1-10 * *",
+                   :adjust => 3,
+                   :min_adjust_step => 14
+                 }
+               ]
+             },
+             {
+               :name => 'gary_ubuntu_2',
+               :vm_template => 'OpenNebula-test-tpl-strings',
+               :cooldown => 123,
+               :min_vms => 1,
+               :max_vms => 5,
+               :elasticity_policies => [
+                 {
+                   :type => "CHANGE",
+                   :cooldown => 17,
+                   :period => 15,
+                   :adjust => 2,
+                   :period_number => 2,
+                   :expression => "ATT == 20"
+                 },
+                 {
+                   :type => "CARDINALITY",
+                   :cooldown => 14,
+                   :period => 13,
+                   :adjust => 3,
+                   :period_number => 1,
+                   :expression => "ATT > 20"
+                 }
+               ]
+             }
+           ]
+end

data/spec/recipes/{driver_options_spec.rb → common.rb}

@@ -1,4 +1,4 @@
-# Copyright 2016, BlackBerry, Inc.
+# 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.
@@ -14,14 +14,20 @@
 
 require 'chef/provisioning/opennebula_driver'
 require 'fileutils'
-require "#{File.dirname(__FILE__)}/../config.rb"
 
 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 DRIVER_URL
+with_flow_url ONE_FLOW_URL.chomp('/') unless ONE_FLOW_URL.nil?
 
 with_machine_options MACHINE_OPTIONS.merge(
   :bootstrap_options => {
     :template => VM_TEMPLATE
   }
 )
+
+one_auth = Chef::Provisioning::OpenNebulaDriver.get_onelib(
+  :driver_url => DRIVER_URL
+).client.one_auth
+
+username = one_auth.split(':').first

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, BlackBerry, Inc.
+# 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.
@@ -19,31 +19,35 @@ require 'chef/provisioning'
 require 'chef/provisioning/opennebula_driver'
 require 'chef/run_context'
 require 'cheffish/rspec/matchers'
-require 'opennebula'
 require 'support/opennebula_support'
 require 'fileutils'
+require_relative 'config.rb'
 
-def test_helper(context, recipe, expected, error = nil)
+def idempotency_helper(context, recipe, expected = nil)
   context context do
-    it { is_expected.to converge_test_recipe(recipe, expected, error) }
+    it { is_expected.to converge_test_recipe(:recipe => recipe, :expected => expected, :fail_if => '(up to date)') }
   end
   context "[SKIP] #{context}" do
-    it { is_expected.to converge_test_recipe(recipe, :idempotent, error) }
+    it { is_expected.to converge_test_recipe(:recipe => recipe, :expected => '(up to date)', :fail_if => nil) }
   end
 end
 
 def cleanup
-  chef_run(%w(
-    OneDriver/delete/OpenNebula-test-tpl.rb
+  # 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-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
-  ))
+    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?
 end
 
 RSpec.configure do |config|
@@ -54,10 +58,11 @@ RSpec.configure do |config|
     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')
+    cleanup
   end
   config.after(:suite) do
     FileUtils.rm_rf('nodes')
-    fail 'Quick cleanup after testing failed.' unless cleanup.include?('Chef Client finished')
+    cleanup
+    FileUtils.rm_rf('/tmp/chef-provisioning-opennebula-rspec-recipe.rb')
   end
 end

data/spec/support/opennebula_support.rb

@@ -1,4 +1,4 @@
-# Copyright 2016, BlackBerry, Inc.
+# 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.
@@ -17,10 +17,21 @@ require 'cheffish/rspec/matchers'
 require 'chef/provisioning/opennebula_driver'
 require 'fileutils'
 
-def chef_run(recipe)
+def chef_run(recipe, append_path = true)
   recipe_array = recipe.is_a?(Array) ? recipe : [recipe]
+  recipe_array.map! { |r| './spec/recipes/' + r } if append_path
+  recipe_array = ['./spec/recipes/common.rb'] + recipe_array
+  FileUtils.rm_rf('/tmp/chef-provisioning-opennebula-rspec-recipe.rb')
+  File.open('/tmp/chef-provisioning-opennebula-rspec-recipe.rb', 'a') do |file|
+    file.puts("require '#{File.dirname(__FILE__)}/../config.rb'")
+    recipe_array.each do |recipe_file|
+      content = File.read(recipe_file)
+      file.puts('')
+      file.puts(content)
+    end
+  end
   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",
+    'chef-client -z /tmp/chef-provisioning-opennebula-rspec-recipe.rb --force-formatter',
     shellout_options(:timeout => 900)
   )
   chef_client.run_command
@@ -32,65 +43,84 @@ def shellout_options(options = {})
 end
 
 def format_error(msg)
-  "================================================================================\n#{msg}\n================================================================================"
+  "================================================================================\n#{msg}\n================================================================================\n "
+end
+
+def get_unique_file(path, basename, rest)
+  p = path.chomp('/')
+  fn = "#{p}/#{basename}#{rest}"
+  return fn unless File.exist?(fn)
+  n = 1
+  n += 1 while File.exist?("#{p}/#{basename}__#{n}#{rest}")
+  "#{p}/#{basename}__#{n}#{rest}"
 end
 
-# 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."
+def get_error(stdout, expected, fail_if)
+  stacktrace = stdout.match(/FATAL: Stacktrace dumped to (.*?chef-stacktrace\.out)/)
+  stacktrace = stacktrace ? stacktrace[1] : nil
+  err = stacktrace ? "Chef run did not report 'Chef Client finished'." : nil
 
-  unless error.nil?
-    case error
+  case fail_if
+  when Regexp
+    return "stdout matched the following when it should not have:\n#{fail_if}", stacktrace if stdout =~ fail_if
+  when String
+    return "stdout included the following when it should not have:\n#{fail_if}", stacktrace if stdout.include?(fail_if)
+  end unless fail_if.nil?
+
+  # Each chef run can only fail due to one reason, so if it was an expected error, we can simply return nil
+  [' RuntimeError: ', ' NoMethodError: ', ' TypeError: ', ' ERROR: ', ' FATAL: '].each do |e|
+    the_error = (stdout.split(e).last).split("\n")[0...-1].join("\n")
+    case expected
     when Regexp
-      return "stdout matched:\n#{error}" if stdout =~ error
+      if e + the_error =~ expected
+        return nil, nil
+      else
+        return "#{e.strip}\n#{the_error}", stacktrace
+      end
     when String
-      return "stdout included:\n#{error}" if stdout.include?(error)
-    end
-  end
-
-  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
+      if (e + the_error).include?(expected)
+        return nil, nil
+      else
+        return "#{e.strip}\n#{the_error}", stacktrace
+      end
+    else
+      return "#{e.strip}\n#{the_error}", stacktrace
+    end if stdout.include?(e)
+  end if err
 
-  return err if expected.nil?
+  return err, stacktrace 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
+    return "stdout did not match the following when it should have:\n#{expected}", stacktrace 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)
+    return "stdout did not include the following when it should have:\n#{expected}", stacktrace unless stdout.include?(expected)
   end
 
-  err
+  [err, stacktrace]
 end
 
-RSpec::Matchers.define :converge_test_recipe do |recipe = nil, expected = :idempotent, error = nil|
-  fail 'All tests require a recipe.' if recipe.nil?
+# data = {
+#   :recipe => 'recipe to test, must be given',
+#   :expected => 'fail if not match, can be errors',
+#   :fail_if => 'fail if match'
+# }
+RSpec::Matchers.define :converge_test_recipe do |data = {}|
+  fail 'All tests require a :recipe.' unless data[:recipe]
   match do
-    stdout = chef_run(recipe)
-    # logs each chef run
-    dir = RSpec.configuration.log_dir + '/' + File.dirname(recipe)
+    stdout = chef_run(data[:recipe])
+
+    dir = RSpec.configuration.log_dir + '/' + File.dirname(data[: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)
+
+    log_basename = File.basename(data[:recipe], '.*')
+    File.open(get_unique_file("./#{dir}", log_basename, '.stdout.log'), 'w+') { |file| file.write(stdout) }
+
+    @error_message, stacktrace = get_error(stdout, data[:expected], data[:fail_if])
     @error_message = format_error(@error_message) unless @error_message.nil?
-    # copies the stacktrace for tests that have failed
-    FileUtils.cp(
-      "#{ENV['HOME']}/.chef/local-mode-cache/cache/chef-stacktrace.out",
-      "./#{dir}/#{log_basename}_stacktrace.out"
-    ) unless @error_message.nil?
+
+    FileUtils.cp(stacktrace, get_unique_file("./#{dir}", log_basename, '.stacktrace.out')) if stacktrace
+
     @error_message.nil?
   end
   failure_message do