cloud-toaster 1.1.5 → 1.1.6

data/webapp/app/views/analysis/convergence.html.erb

@@ -10,12 +10,12 @@ convs = {}
 begin
 
 show_all_link = false
-automation = nil
-if param('task') != ""
+automation = cur_auto
+if param('task_id') != ""
 	tasks = [get_task_for_param()]
 	show_all_link = true
-elsif param('auto') != ""
-	automation = get_automation_for_param()
+end
+if automation
 	tasks = automation.get_globally_executed_tasks() if automation
 end
 
@@ -31,9 +31,10 @@ end
 end
 
 %>
-<h2>Convergence of System State</h2>
+<h1>Convergence of System State</h1>
 <form action="#" method="post">
 <% if tasks %>
+	Selected automation UUID: <%= automation.uuid %>
 	<% if show_all_link %>
 		<ul>
 		<li>Currently only displaying convergence of a single task. <a href="<%= l('task' => '') %>">Show All Tasks</a>
@@ -41,7 +42,7 @@ end
 		</ul>
 	<% end %>
 	
-	<h3>Track State Properties</h3>
+	<h2>Track State Properties</h2>
 	Enter state property name patterns (one per line):<br/>
 	<textarea rows="3" cols="40" name="trackProps"><%= 
 		param("trackProps") != "" ? param("trackProps") : ".*"
@@ -60,8 +61,10 @@ end
 				props << prop
 			end
 			exes = []
-			traces[run][props[0]].collect do |tuple| 
-				exes << tuple[0]
+			if traces[run][props[0]]
+				traces[run][props[0]].collect do |tuple| 
+					exes << tuple[0]
+				end
 			end
 			%>
 			<table class="tablesorter"><thead><tr>
@@ -106,7 +109,7 @@ end
 			post_states = Set.new(task.global_post_states_flat)
 			%>
 			<tr><td colspan="4">Task 
-				<b><a href="<%= l('t'=>'tasks', 'task'=>task.id) %>"><%= task.name %></a></b>
+				<b><a href="/scripts/<%= task.automation.id %>/tasks/<%= task.id %>"><%= task.name %></a></b>
 			</td></tr>
 			<%
 			{"PRE-state" => pre_states, 
@@ -132,9 +135,9 @@ end
 	end
 	%>
 
-	<h3>State Convergence By Task</h3>
+	<h2>State Convergence By Task</h2>
 	<% tasks.each do |task| %>
-		<h3>State Convergence of Task '<a href="<%= l('t'=>'tasks', 'task'=>task.id) %>"><%= task.name %></a>'</h3>
+		<h3>State Convergence of Task '<a href="/scripts/<%= task.automation.id %>/tasks/<%= task.id %>"><%= task.name %></a>'</h3>
 		<% 	task_convs = convs[task] ? convs[task] : []
 			if task_convs.empty? %>
 				No convergent state property found for this task.

data/webapp/app/views/analysis/idempotence.html.erb

@@ -1,2 +1,41 @@
 <h1>Idempotence</h1>
-<p>coming soon...</p>
+<%
+
+require 'toaster/state/idempotence'
+require 'toaster/util/util'
+
+auto = cur_auto
+suite = cur_suite
+non_idem = nil
+if suite
+	auto = suite.automation
+	idem_check = Idempotence.new(suite)
+	non_idem = idem_check.non_idempotent_task_seq()
+elsif auto
+	idem_check = Idempotence.new(auto)
+	non_idem = idem_check.non_idempotent_task_seq()
+end
+
+%>
+
+<% if auto %>
+	Automation UUID: <%= auto.uuid %>
+	<% if suite %>
+	<br/>Test Suite UUID: <%= suite.uuid %>
+	<% end %>
+	<h2>Non-Idempotent Task Sequences</h2>
+	<table>
+	<thead>
+	<tr><th>ID</th><th>Task List</th></tr>
+	</thead>
+	<% non_idem.each_with_index do |seq,idx| 
+		seq = seq.collect {|t| 
+			"<a href=\"/scripts/#{t.automation.id}/tasks/#{t.id}\">#{t.resource}</a>"
+		}
+	%>
+	<tr><td><%= idx+1 %></td><td><%= seq.join(" &rarr; ").html_safe %></td></tr>
+	<% end %>
+	</table>
+<% else %>
+	Please select an <b>automation</b> or a specific <b>test suite</b> to perform idempotence analysis.
+<% end %>

data/webapp/app/views/analysis/index.html.erb

@@ -0,0 +1,117 @@
+<h1>Test Analysis</h1>
+<h2>Automations</h2>
+<%
+
+require 'toaster/state/convergence'
+require 'toaster/util/util'
+require 'toaster/model/automation'
+
+autos = Toaster::Automation.find()
+auto = cur_auto
+tasks = []
+suite = suite
+show_toaster_tasks = false
+if cur_suite
+	auto = suite.automation
+end
+if auto
+	tasks = auto.tasks.to_a
+end
+
+%>
+
+<table class="tablesorter">
+<thead>
+<tr>
+	<th>#</th><th>UUID</th><th>Name</th><th>Type</th><th>Tasks</th>
+	<th>Attributes</th><th>Runs</th><th>State Changes</th><th colspan="6">Actions</th></tr>
+</thead>
+<tbody>
+<% autos.each_with_index { |row,id| 
+t = Time.now.to_i
+active = !auto ? false : row.id == auto.id
+param_auto = active ? "" : row.id
+param_hash = {"auto" => param_auto, "run" => "", "task" => "", "exe" => ""}
+num_runs = row.get_num_runs	
+globally_executed_tasks = row.get_globally_executed_tasks
+prop_changes = row.num_global_state_transitions
+%>
+<tr class="<%= active ? "active" : "" %>">
+	<td><%= id+1 %></td>
+	<td><a href="/scripts/<%= row.id %>/details"><%= row.uuid %></a></td>
+	<td><%= row.name %></td>
+	<td><%= row.language %></td>
+	<td><%= globally_executed_tasks.size %></td>
+	<td><%= row.automation_attributes.size %></td>
+	<td><%= num_runs %></td>
+	<td><%= link_to "#{prop_changes}", "/execs/#{row.id}/tasks" %></td>
+	<td><%= link_to 'details', "/analysis/index/#{row.id}" %></td>
+	<td><%= link_to 'convergence', "/analysis/conv/auto/#{row.id}" %></td>
+	<td><%= link_to 'idempotence', "/analysis/idem/auto/#{row.id}" %></td>
+</tr>
+<% } %>
+</tbody>
+</table>
+
+<% if !auto %>
+	Please select an <b>automation</b> or a specific <b>test suite</b> to perform idempotence analysis.
+<% else %>
+	<h2>Automation Details</h2>
+	<p>Selected Automation UUID: <%= auto.uuid %></p>
+	<h3>Automation Tasks</h3>
+	<% if suite %>
+	<br/>Test Suite UUID: <%= suite.uuid %>
+	<% end %>
+
+<table class="tablesorter" id="tablesorter">
+	<thead>
+	<tr><th>#</th><th>ID</th>
+		<th>Resource</th><th>Action</th>
+		<!--<th>File</th><th>Line</th>-->
+		<th>Success (%)</th>
+		<th>State Changes</th>
+		<th colspan="2">Actions</th></tr>
+	</thead>
+	<tbody>
+	<% count = 0
+	tasks.each_with_index { |row,id|
+	if show_toaster_tasks || !row.toaster_testing_task?
+		active = false
+		param_task = active ? "" : row.id
+		clazz = active ? "active " : ""
+		clazz.strip!
+		#prop_changes = row.global_state_prop_changes
+		prop_changes = row.global_state_transitions
+		%>
+		<tr<%= clazz != '' ? " class=\"#{clazz}\"" : "" %>>
+			<td><%= count += 1 %></td>
+			<td><%= row.uuid %></td>
+			<td><%= row.resource %></td>
+			<td><%= row.action %></td>
+			<!--<td><%= row.sourcefile %></td>
+			<td><%= row.sourceline %></td>-->
+			<td><%= format_float(row.global_success_percentage) %> %</td>
+			<td><%= prop_changes.size %></td>
+			<td><a href="/analysis/conv/task/<%= row.id %>">convergence</a></td>
+			<td><a href="/analysis/idem/task/<%= row.id %>">idempotence</a></td>
+		</tr>
+	<% end
+	} %>
+	</tbody>
+</table>
+
+	<h3>All Affected State Properties</h3>
+	<table class="tablesorter">
+		<thead>
+		<tr><th>Property Name</th></tr>
+		</thead>
+		<% 	begin
+				auto.all_affected_property_names.each do |p| %>
+		<tr><td><%= p %></td></tr>
+		<% 		end
+			rescue => ex %>
+		 <tr><td>[Error: <%= ex %> <%= ex.backtrace %>]</td></tr>
+		<% 	end %>
+	</table>
+	
+<% end %>

data/webapp/app/views/execs/automation_runs.html.erb

@@ -10,7 +10,6 @@ begin
 	auto = cur_auto()
 	runs = cur_runs()
 	run = cur_run()
-	puts "run #{run}"
 
 end
 
@@ -18,24 +17,26 @@ end
 <div>
 <h1>Automation Runs</h1>
 
+<p>
 <ul><li>
-<% if auto %>
+<% if auto && auto.id %>
 	Displaying runs of automation <b>'<%= auto.name %>'</b>. 
 	(<a href="/execs">show all</a>)
 <% else %>
 	Displaying runs of all automations. Use the 'Automation' section to filter the list for a specific automation.
 <% end %>
 </li></ul>
+</p>
 
 <table class="tablesorter">
 <thead>
 <tr><th>#</th><th>UUID</th><th>Automation</th><th>Start Time</th><!-- <th>Machine ID</th> -->
-<th>Task Executions</th><th>Duration</th><th>Success</th><th colspan="2">Actions</th></tr>
+<th>Task Executions</th><th>Duration</th><th>Success</th><th colspan="3">Actions</th></tr>
 </thead>
 <tbody>
 <% runs.each_with_index { |row,id| 
 clazz = row.success ? 'success' : 'error'
-active = row.id.to_s == param('run')
+active = run && row.id == run.id
 clazz += ' active' if active
 param_run = active ? "" : row.id
 auto_name = row.automation ? row.automation.name : "n/a"
@@ -52,6 +53,11 @@ param_hash = {"run" => param_run}.merge(row.automation ? {'auto' => row.automati
 	<td class="center"><%= row.success ? "true" : "false" %></td>
 	<td><% if row.automation %><a href="/execs/<%= row.automation.id %>/<%= row.id %>">details</a><% end %></nobr></td>
 	<td><% if row.automation %><a href="/execs/<%= row.automation.id %>/<%= row.id %>/tasks">executed tasks</a><% end %></nobr></td>
+	<td><%= if row.automation
+			link_to 'delete', "/execs/#{row.automation.id}/#{row.id}",
+            :data => { :confirm => 'Confirm: Delete this automation run, including all task executions?'
+            }, :method => :delete
+            end %></td>
 </tr>
 <% } %>
 </tbody>

data/webapp/app/views/execs/task_executions.html.erb

@@ -8,16 +8,16 @@ run = cur_run()
 show_toaster_tasks = true # TODO
 
 %>
-<h2>Task Executions</h2>
+<h1>Task Executions</h1>
 <% if task 
 global_executions = task.global_executions
 %>
-	<h3>Details of Task '<%= task.name %>'</h3>
+	<h2>Details of Task '<%= task.name %>'</h2>
 	<table>
 		<tr><td>Number of executions:</td><td><%= global_executions.size %></td></tr>
 	</table>
 
-	<h4>Executions</h4>
+	<h3>Executions</h3>
 	<table class="properties tablesorter">
 	<thead>
 	<tr><th>#</th><th>Automation Run</th><th>Start Time</th><th>Duration</th><th>Success</th><th>Property<br/>Changes</th><th>Actions</th></tr>
@@ -30,25 +30,30 @@ global_executions = task.global_executions
 	%>
 	<tr class="<%= exe.success ? 'success' : 'error' %><%= active ? ' active' : '' %>">
 		<td><%= index+1 %></td>
-		<td><a href="/execs/<%= run.automation.id %>/<%= run.id %>"><%= run.uuid %></a></td>
+		<td><% if run.automation %>
+		<a href="/execs/<%= run.automation.id %>/<%= run.id %>"><%= run.uuid %></a>
+		<% end %></td>
 		<td><%= format_time(exe.start_time) %></td>
 		<td><%= to_minutes(exe.end_time.to_i - exe.start_time) %></td>
 		<td><%= exe.success %></td>
 		<td><%= exe.state_changes.size %></td>
-		<td><a href="<%= l('exe' => param_exe) %>"><%= active ? "hide" : "show" %> details</a></td>
+		<td><% if run.automation %>
+		<a href="/execs/<%= run.automation.id %>/tasks/<%= task.id %>/<%= exe.id %>">details</a>
+		<% end %></td>
 	</tr>
 	<% end %>
 	</tbody>
 	</table>
 
 	<% if exec %>
-	<h4>Execution Details</h4>
+	<h3>Execution Details</h3>
+		<p>Task execution UUID: <%= exec.uuid %></p>
 		<% if exec.output && exec.output.strip != "" %>
-		<h5>Script Output:</h5>
+		<h4>Script Output:</h4>
 		<pre style="overflow: auto; height: 100px"><%= exec.output %></pre>
 		<% end %>
 		<% if !exec.success && exec.error_details %>
-		<h5>Error Details:</h5>
+		<h4>Error Details:</h4>
 		<pre style="overflow: auto; height: 250px"><%= exec.error_details %></pre>
 		<% end %>
 		<script type="text/javascript" src="/assets/jquery.jstree.js"></script>
@@ -57,11 +62,10 @@ global_executions = task.global_executions
 		<script type="text/javascript" src="/assets/jstree.util.js"></script>
 		<% if exec.state_before %>
 		<div class="stateFrame">
-			<h5>Pre-State:</h5>
+			<h4>Pre-State:</h4>
 			<div id="preState"></div>
 		</div>
 		<script type="text/javascript">
-			<%= puts exec.state_before.to_s %>
 			var jsonData = <%= exec.state_before.to_json.html_safe %>
 			initTree("preState", jsonData);
 		</script>
@@ -69,7 +73,7 @@ global_executions = task.global_executions
 		<div style="width: 5%; float: left;">&nbsp;</div>
 		<% if exec.state_after %>
 		<div class="stateFrame">
-			<h5>Post-State:</h5>
+			<h4>Post-State:</h4>
 			<div id="postState"></div>
 		</div>
 		<script type="text/javascript">
@@ -80,7 +84,7 @@ global_executions = task.global_executions
 		<div style="clear: both"></div>
 	<% end %>
 
-	<h4>State changes</h4>
+	<h3>State changes</h3>
 	<table id="properties" class="tablesorter">
 		<thead>
 		<tr><th>Action</th><th>Property</th><th colspan="3">Value(s)</th><th>Occurrences</th><th>Occurrences (%)</th></tr>
@@ -105,10 +109,10 @@ global_executions = task.global_executions
 	</table>
 
 <% elsif run %>
-
+<p>Automation run UUID: <%= run.uuid %></p>
 <table class="tablesorter" id="tablesorter">
 	<thead>
-	<tr><th>#</th><th>ID</th>
+	<tr><th>#</th><th>Task ID</th>
 		<th>Start Time</th><th>Duration</th>
 		<th>Resource</th><th>Action</th><th>File</th><th>Line</th>
 		<th>Success</th>
@@ -119,7 +123,7 @@ global_executions = task.global_executions
 	run.task_executions.each_with_index { |exec,id|
 	row = exec.task
 	if show_toaster_tasks || !row.toaster_testing_task?
-		active = row.id.to_s == param('task')
+		active = task && row.id == task.id
 		param_task = active ? "" : row.id
 		clazz = active ? "active " : ""
 		if !run && detailed
@@ -140,7 +144,7 @@ global_executions = task.global_executions
 			<td><%= row.sourcefile %></td>
 			<td><%= row.sourceline %></td>
 			<td><%= exec.success %></td>
-			<td><a href="/execs/<%= run.automation.id %>/tasks/<%= exec.id %>/<%= run.id %>">details</a></td>
+			<td><a href="/execs/<%= run.automation.id %>/tasks/<%= exec.task.id %>/<%= exec.id %>">details</a></td>
 		</tr>
 	<% end
 	} %>

data/webapp/app/views/layouts/application.html.erb

@@ -19,9 +19,6 @@
     session['db.host'] = Toaster::Config.get("db.host") if "#{session['db.host']}".empty?
     session['db.port'] = Toaster::Config.get("db.port") if "#{session['db.port']}".empty?
     %>
-	<p class="notice"><%= notice %></p>
-    <p class="alert"><%= alert %></p>
-
     <div class="container">
 		<div class="header">
 			<h1>ToASTER<sup>[beta]</sup></h1>
@@ -66,10 +63,10 @@
                             </div>
                         </a>
                         <ul><li><a href="/execs">Automation Runs</a></li>
-                        <li><a href="/execs/0/tasks">Task Executions</a></li></ul>
+                        <li><a href="/execs/tasks">Task Executions</a></li></ul>
                     </li>
                     <li class="<%= request.path.match(/^\/analysis/) ? "active" : "inactive" %>">
-                        <a href="/analysis/conv">
+                        <a href="/analysis/index">
                             <span class="ca-icon">L</span>
                             <div class="ca-content">
                                 <h2 class="ca-main">Analysis</h2>
@@ -90,24 +87,40 @@
                         <ul><li><a href="/util/chef">Chef</a></li></ul>
                     </li>
                     <li class="<%= request.path.match(/^\/settings/) ? "active" : "inactive" %>">
-                        <a href="/settings/index">
+                        <a href="/settings/config">
                             <span class="ca-icon">K</span>
                             <div class="ca-content">
                                 <h2 class="ca-main">Settings</h2>
                                 <h3 class="ca-sub">Adjust configurations</h3>
                             </div>
                         </a>
-                        <ul><li><a href="/settings/index">Configuration</a></li>
+                        <ul><li><a href="/settings/config">Configuration</a></li>
                         <li><a href="/settings/containers">Containers</a></li></ul>
                     </li>
                 </ul>
 
 		<div class="pages">
-			<div id="quickstart" class="panel">
 			<div class="content">
+				<div class="messages">
+					<% flash.each do |name, msg| 
+						if msg.kind_of?(Array) && msg.size == 1
+							msg = msg[0]
+						end %>
+					<div class="<%= name %>">
+					<%	if msg.kind_of?(Array) %>
+						<ul>
+					<%		msg.each do |msg1| %>
+							<li><%= msg1 %></li>
+				    <% 		end %>
+				    	</ul>
+				    <%	else %>
+							<%= msg %>
+				    <% end %>
+				    </div>
+				    <% end %>
+				</div>
 				<%= yield %>
 			</div>
-			</div>
 		</div>
 	</div>
 </body>