X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;fp=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=0f919ab71c07773f801aad5afe895be25a295216;hp=68df2eb8729ac352d3b36764a3465a6805e0f01d;hb=32e47491837a321e684ea167ab6aa430145562f1;hpb=5757568294bc4a4fee336acbc1822c28166b5715

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index 68df2eb..0f919ab 100644
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -12,6 +12,7 @@ from monitor.database.info.model import *
 #from monitor.database.zabbixapi.model import *
 from monitor_xmlrpc import MonitorXmlrpcServer
 from controllers_local import LocalExtensions
+from pcucontrol.reboot import pcu_name
 
 from monitor import util
 from monitor import reboot
@@ -148,7 +149,7 @@ def format_ports(data, pcumodel=None):
 def format_pcu_shortstatus(pcu):
 	status = "error"
 	if pcu:
-		if pcu.reboot_trial_status == str(0):
+		if pcu.reboot_trial_status == str(0) or pcu.reboot_trial_status == "Test: No error":
 			status = "Ok"
 		elif pcu.reboot_trial_status == "NetDown" or pcu.reboot_trial_status == "Not_Run":
 			status = pcu.reboot_trial_status
@@ -170,6 +171,7 @@ def prep_pcu_for_display(pcu):
 
 	agg.ports = format_ports(pcu.port_status, pcu.plc_pcu_stats['model'])
 	agg.status = format_pcu_shortstatus(pcu)
+	agg.pcu_name = pcu_name(pcu.plc_pcu_stats)
 
 	#print pcu.entry_complete
 	agg.entry_complete_str = pcu.entry_complete
@@ -604,6 +606,12 @@ class Root(controllers.RootController, MonitorXmlrpcServer, LocalExtensions):
 				for pcuid_key in pcus:
 					pcuquery += [pcus[pcuid_key]]
 
+		#for a in nodequery:
+		#	print type(a.node)
+		#	print type(a.node.hostname)
+		nodequery.sort(lambda a,b: cmp(a.node.hostname,b.node.hostname))
+		pcuquery.sort(lambda a,b: cmp(a.pcu_name,b.pcu_name))
+
 		actionlist_widget = ActionListWidget(template='monitorweb.templates.actionlist_template')
 		return dict(sitequery=sitequery, pcuquery=pcuquery, nodequery=nodequery, actions=actions_list, actionlist_widget=actionlist_widget, since=since, exceptions=exceptions)