cloud-toaster 1.1.5 → 1.1.6

data/lib/toaster/test/test_suite.rb

@@ -20,7 +20,7 @@ module Toaster
     belongs_to :automation
     belongs_to :user
     belongs_to :test_coverage_goal
-    has_many :test_cases, nil, {:autosave => true, :dependent => :delete_all}
+    has_many :test_cases, :autosave => true, :dependent => :destroy
     serialize :parameter_test_values, JSON
 
     def initialize(attr_hash)

data/lib/toaster/test_manager.rb

@@ -106,6 +106,7 @@ module Toaster
       # get additional_state_configs from automation
       automation = AutomationRun.get_current().automation
       add_automation_specific_state_config(@state_change_config)
+      task.automation = automation if !task.automation
 
       # determine which parameters the task code accesses:
       task.task_parameters.concat(ResourceInspector.get_accessed_parameters(task))
@@ -248,15 +249,8 @@ module Toaster
       if !test_suite.kind_of?(TestSuite)
         test_suite = TestSuite.find({"uuid" => test_suite})
       end
-      if blocking
-        runner = TestRunner.new(test_suite, nil, false)
-        runner.start_test_suite(blocking)
-        runner.stop
-      else
-        runner = TestRunner.new(test_suite, nil, true)
-        runner.start_test_suite(blocking)
-        runner.start_worker_threads()
-      end
+      tests_to_run = test_suite.test_cases.select { |tc| !tc.executed? }
+      TestRunner.instance.execute_tests(tests_to_run, blocking)
     end
 
     private

data/lib/toaster/toaster_app_service.rb

@@ -137,9 +137,5 @@ if ARGV.include?("do_start_service")
   puts "Starting service on port #{$service_port}"
   Toaster::Config.init_db_connection()
   server = ToasterAppService.new($service_port, "0.0.0.0")
-
-#  client = ToasterApp.new()
-# client.runtest("2285f8539f6c48873")
-#  client.runtests("88056bebc7e384cac")
   server.start
 end

data/lib/toaster/util/config.rb

@@ -44,6 +44,9 @@ module Toaster
     end
 
     def self.init_db_connection(config=nil)
+      if $db_connection_initialized
+        return
+      end
       require "toaster/util/util"
       if !config || !config["mysql"]
         config = {
@@ -59,8 +62,10 @@ module Toaster
           :host => "#{config["mysql"]["host"]}".empty? ? get("db.host") : config["mysql"]["host"],
           :database => "#{config["mysql"]["database"]}".empty? ? get("db.database") : config["mysql"]["database"],
           :username => "#{config["mysql"]["username"]}".empty? ? get("db.username") : config["mysql"]["username"],
-          :password => "#{config["mysql"]["password"]}".empty? ? get("db.password") : config["mysql"]["password"]
+          :password => "#{config["mysql"]["password"]}".empty? ? get("db.password") : config["mysql"]["password"],
+          :pool => 50 # connection pool size limit (default is 5 which is not sufficient)
         )
+        $db_connection_initialized = true
       else
         puts "WARN: Incorrect database connection configuration"
       end

data/lib/toaster/util/lxc.rb

@@ -139,7 +139,7 @@ module Toaster
           node_attributes["toaster"][key] = value
         end
       end
-      puts "DEBUG: Chef automation #{chef_node}, node attributes: #{node_attributes.inspect}"
+      puts "DEBUG: Chef automation #{chef_node}, node attributes: #{MarkupUtil.to_json(node_attributes)}"
 
       run_chef(lxc, chef_node, node_attributes)
     end

data/webapp/app/assets/javascripts/jstree.util.js

@@ -1,7 +1,8 @@
 function initTree(containerID, jsonData) {
 	$("#" + containerID).jstree({
 		"plugins" : [ 
-			"themes","json_data","ui","crrm","cookies","dnd","search","types","hotkeys","contextmenu" 
+			//"themes",
+			"json_data","ui","crrm","cookies","dnd","search","types","hotkeys","contextmenu" 
 		],
 		"json_data" : { 
 			"data" : prepareTreeNode(jsonData)

data/webapp/app/assets/stylesheets/application.css

@@ -18,7 +18,18 @@
   font-weight: 400;
   src: local('Dosis Regular'), local('Dosis-Regular'), url("/assets/font.woff") format('woff');
 }
-
+div.messages div {
+	width: 90%; margin: auto;
+	padding: 7px;
+}
+div.messages .info, div.messages .notice {
+	border: 1px solid #F7DF8D;
+	background: #FAEDC1;
+}
+div.messages .warn, div.messages .alert, div.messages .error {
+	border: 1px solid #FBA3A3;
+	background: #FFD4D4;
+}
 .content table {
 	border: 1px solid #bbc;
 }
@@ -46,4 +57,13 @@
 .content .unremarkable, .content .unremarkable td {
 	opacity: 0.7;
 	-moz-opacity: 0.7;
+}
+tr.active td {
+	font-weight: bold;
+}
+.content pre {
+	border: 1px solid #dddddd;
+	background: #f1f1f1;
+	font-size: 12px;
+	margin: 10px;
 }

data/webapp/app/assets/stylesheets/layout.css

@@ -110,7 +110,7 @@ h1 {
 }
 .panel:target, .pages > :last-child {
 	position: absolute;
-	left: 300px;
+	left: 250px;
 	opacity: 1;
 	-webkit-transition: opacity 200ms ease-in;
 	-moz-transition: opacity 200ms ease-in;

data/webapp/app/controllers/analysis_controller.rb

@@ -1,7 +1,19 @@
 class AnalysisController < ApplicationController
+
+  skip_before_action :verify_authenticity_token
+
   def idempotence
   end
 
   def convergence
   end
+
+  def cur_auto()
+    ScriptsController.cur_auto(session, params)
+  end
+  def cur_suite
+    TestController.cur_suite(session, params)
+  end
+
+  helper_method :cur_auto, :cur_suite
 end

data/webapp/app/controllers/application_controller.rb

@@ -5,10 +5,18 @@ class ApplicationController < BaseController
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery :with => :exception
 
-  # use authentication based on "devise"
-  before_filter :authenticate_user!
-
   # global requires
   $LOAD_PATH << File.join(File.dirname(__FILE__), "../../../../../lib") 
 
+  # use authentication based on "devise"
+  #before_filter :authenticate_user!
+  include Devise::Controllers::Helpers
+  before_filter do
+    fail "bad ancestor" unless self.kind_of?(Devise::Controllers::Helpers)
+    fail "no mapping" unless Devise.class_variable_get(:@@mappings)[:user]
+    authenticate_user!
+  end
+
+  #acts_as_token_authentication_handler_for User, :fallback_to_devise => false
+
 end

data/webapp/app/controllers/base_controller.rb

@@ -1,3 +1,4 @@
+
 class BaseController < ActionController::Base
 
   def l(hash=nil) 

data/webapp/app/controllers/execs_controller.rb

@@ -10,9 +10,17 @@ class ExecsController < ApplicationController
 	end
 
 	def list
-
 	end
 
+	def delete_run
+    run = cur_run
+    if run
+      run.destroy
+      msg = "Successfully deleted automation run with UUID '#{run.uuid}'"
+      flash[:notice] ? (flash[:notice] << msg) : (flash[:notice] = [msg])
+    end
+    redirect_to "/execs"
+	end
 
 	def cur_auto()
 		ScriptsController.cur_auto(session, params)
@@ -26,9 +34,9 @@ class ExecsController < ApplicationController
 		end
 	end
 
-  	def cur_run()
-  		ExecsController.cur_run(session, params)
-  	end
+  def cur_run()
+  	ExecsController.cur_run(session, params)
+  end
 	def self.cur_run(session, params)
 		a = ScriptsController.cur_auto(session, params)
 		return nil if !a

data/webapp/app/controllers/scripts_controller.rb

@@ -1,6 +1,7 @@
 class ScriptsController < ApplicationController
 
-	require "toaster/model/automation"
+  require "toaster/model/automation"
+  require "toaster/model/key_value_pair"
   require "toaster/model/automation_attribute"
   require "toaster/chef/chef_util"
 
@@ -14,9 +15,11 @@ class ScriptsController < ApplicationController
   		if request.post? || request.patch?
   			if params[:add_param]
   				auto = cur_auto
+          set_auto_values(auto)
   				auto.automation_attributes << Toaster::AutomationAttribute.new(
 			  			:key => "", :value => "")
   			elsif params[:del_param]
+          set_auto_values(auto)
 	  			params[:auto][:attr].each do |index,attr|
 	  				if params[:del_param][index]
 	  					to_delete = cur_auto.automation_attributes[index.to_i - 1]
@@ -26,9 +29,11 @@ class ScriptsController < ApplicationController
 	  			end
   			elsif params[:add_ignoreprop]
   				auto = cur_auto
+          set_auto_values(auto)
   				auto.ignore_properties << Toaster::IgnoreProperty.new(
 			  			:key => "", :value => "")
   			elsif params[:del_ignoreprop]
+          set_auto_values(auto)
 	  			params[:auto][:ignoreprop].each do |index,attr|
 	  				if params[:del_ignoreprop][index]
 	  					to_delete = cur_auto.ignore_properties[index.to_i - 1]
@@ -38,13 +43,16 @@ class ScriptsController < ApplicationController
 	  			end
   			elsif params[:add_additionalprop]
   				auto = cur_auto
+          set_auto_values(auto)
   				auto.additional_properties << Toaster::AdditionalProperty.new(
 			  			:key => "", :value => "")
   			elsif params[:del_additionalprop]
+          auto = cur_auto
+          set_auto_values(auto)
 	  			params[:auto][:additionalprop].each do |index,attr|
 	  				if params[:del_additionalprop][index]
-	  					to_delete = cur_auto.additional_properties[index.to_i - 1]
-	  					cur_auto.additional_properties.destroy(to_delete) if to_delete
+	  					to_delete = auto.additional_properties[index.to_i - 1]
+	  					auto.additional_properties.destroy(to_delete) if to_delete
 	  					break
 	  				end
 	  			end
@@ -57,27 +65,7 @@ class ScriptsController < ApplicationController
 			  	else
 			  		auto = cur_auto
 			  	end
-	  			auto.name = params[:auto][:name]
-	  			auto.language = params[:auto][:language]
-	  			auto.visibility = params[:auto][:visibility]
-	  			auto.user = current_user
-	  			auto.script = params[:auto][:script]
-	  			if params[:auto][:attr]
-		  			params[:auto][:attr].each do |index,attr|
-		  				auto.automation_attributes[index.to_i - 1].key = attr["key"]
-		  				auto.automation_attributes[index.to_i - 1].value = attr["value"]
-		  			end
-		  		end
-		  		if params[:auto][:ignoreprop]
-		  			params[:auto][:ignoreprop].each do |index,prop|
-		  				auto.ignore_properties[index.to_i - 1].key = prop["key"]
-		  			end
-		  		end
-		  		if params[:auto][:additionalprop]
-		  			params[:auto][:additionalprop].each do |index,prop|
-		  				auto.additional_properties[index.to_i - 1].key = prop["key"]
-		  			end
-		  		end
+	  			set_auto_values(auto)
 				auto.save
 		  		redirect_to scripts_url()
 		  	end
@@ -86,11 +74,35 @@ class ScriptsController < ApplicationController
 		end
   	end
 
+  	def set_auto_values(auto)
+      auto.name = params[:auto][:name]
+      auto.language = params[:auto][:language]
+      auto.visibility = params[:auto][:visibility]
+      auto.user = current_user
+      auto.script = params[:auto][:script]
+      if params[:auto][:attr]
+        params[:auto][:attr].each do |index,attr|
+          auto.automation_attributes[index.to_i - 1].key = attr["key"]
+          auto.automation_attributes[index.to_i - 1].value = attr["value"]
+        end
+      end
+      if params[:auto][:ignoreprop]
+        params[:auto][:ignoreprop].each do |index,prop|
+          auto.ignore_properties[index.to_i - 1].key = prop["key"]
+        end
+      end
+      if params[:auto][:additionalprop]
+        params[:auto][:additionalprop].each do |index,prop|
+          auto.additional_properties[index.to_i - 1].key = prop["key"]
+        end
+      end
+  	end
+
   	def delete
   		id = params[:auto_id]
   		a = Toaster::Automation.find(id)
   		if a
-	  		a.delete
+	  		a.destroy
 	  	end
 	  	redirect_to scripts_url()
   	end
@@ -107,44 +119,71 @@ class ScriptsController < ApplicationController
   				:user => current_user,
   				:script => script_file
   			)
-  			#puts "params[:recipes].split(/[\s,;]+/) #{params[:recipes].split(/[\s,;]+/)}"
+  			# get recipes
   			params[:recipes].split(/[\s,;]+/).each do |rec|
-	  			recipe_info = ChefUtil.parse_resources(
-	  				params[:cookbook], rec, params[:cookbook_version])[params[:cookbook]][rec]
-	  			recipe_info["resources"].each do |line,code|
-            action = "__action__"
-            resource = "__resource__"
-	  			  if recipe_info["resource_objs"][line]
-		  			   action = recipe_info["resource_objs"][line].action
-	  				   action = action.join(" , ") if action.kind_of?(Array)
-	  				   resource = recipe_info["resource_objs"][line].resource_name
-  	        end
-	  				task = Task.new(
-		  				:automation => a,
-		  				:sourceline => line,
-		  				:sourcecode => code,
-		  				:sourcefile => recipe_info["file"],
-		  				:resource => resource,
-		  				:action => action
-		  			)
-		  			task.save
-		  			a.tasks << task
-	  			end
-	  		end
-  			a.save
-		  	redirect_to scripts_url()
+  			  begin
+  	  			recipe_info = ChefUtil.parse_resources(
+  	  				params[:cookbook], rec, params[:cookbook_version])[params[:cookbook]][rec]
+            # get recipe parameters
+  		      insp = ChefNodeInspector.new { |level, msg|
+              if flash[:notice] 
+                flash[:notice].concat(msg)
+              else
+                flash[:notice] = [msg]
+              end 
+            }
+  		      attr_hash = insp.get_defaults(params[:cookbook], rec)
+  	        a.automation_attributes.concat(
+  	          KeyValuePair.flat_attributes_from_hash(
+  	            attr_hash, AutomationAttribute))
+
+  	  			recipe_info["resources"].each do |line,code|
+              action = "__action__"
+              resource = "__resource__"
+  	  			  if recipe_info["resource_objs"][line]
+  		  			   action = recipe_info["resource_objs"][line].action
+  	  				   action = action.join(" , ") if action.kind_of?(Array)
+  	  				   resource = recipe_info["resource_objs"][line].to_s
+    	        end
+  	  				task = Task.new(
+  		  				:automation => a,
+  		  				:sourceline => line,
+  		  				:sourcecode => code,
+  		  				:sourcefile => recipe_info["file"],
+  		  				:resource => resource,
+  		  				:action => action
+  		  			)
+              # get task parameters
+              task.task_parameters = ResourceInspector.get_accessed_parameters(task)
+              # save
+  		  			task.save
+  		  			a.tasks << task
+  	  			end
+            # save
+            a.save
+          rescue Object => ex
+              msg = "WARN: Unable to import Chef cookbook '#{params[:cookbook]}', " +
+                "version '#{params[:cookbook_version]}', recipe '#{rec}': #{ex}"
+              flash[:alert] = msg
+              puts msg
+              puts ex.backtrace.join("\n")
+          end
+        end
+        redirect_to scripts_url()
   		end
   	end
 
   	def cur_auto_reset()
-		session[:auto_cur] = nil
+      session[:auto_cur] = nil
   	end
 
   	def cur_auto()
   		ScriptsController.cur_auto(session, params)
   	end
   	def self.cur_auto(session, params)
-  		if !session[:auto_cur] || "#{session[:auto_cur].id}" != params[:auto_id]
+  		if !session[:auto_cur] || (
+          session[:auto_cur].id && "#{session[:auto_cur].id}" != params[:auto_id])
+
   			session[:auto_cur] = nil
   			if params[:auto_id] == "0"
 				session[:auto_cur] = Toaster::Automation.new(

data/webapp/app/controllers/test_controller.rb

@@ -57,8 +57,9 @@ class TestController < ApplicationController
       test_case.start_time = nil
       test_case.end_time = nil
       if test_case.automation_run
-        test_case.automation_run.delete
+        test_case.automation_run.destroy
       end
+      test_case.executing_host = nil
       test_case.save
       redirect_to "/test/suites/#{test_case.test_suite.id}"
     else
@@ -79,16 +80,15 @@ class TestController < ApplicationController
     test_suite = cur_suite
     client = service_client
     session[:suite_cur] = nil
-    client.runtests(test_suite.uuid)
+    session[:exec_output] = client.runtests(test_suite.uuid)
     redirect_to "/test/suites/#{params["suite_id"]}"
   end
 
   def delete_suite
-    puts "deleting suite ..."
     if cur_suite
       puts "deleting suite #{cur_suite}"
       session[:suite_cur] = nil
-      cur_suite.delete
+      cur_suite.destroy
       redirect_to "/test/suites"
     end
   end