From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Tue, 2 Jun 2009 11:48:35 +0000 (+0000)
Subject: in nodes page: print the status computed by monitor instead of the status retrieved... 
X-Git-Tag: Monitor-3.0-12~4
X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=79dafa3630631b247aa826590dd9daf027e21e0e

in nodes page: print the status computed by monitor instead of the status retrieved from PLC

--debug lines
---

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index 68f9d6a..9bdb912 100644
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -183,7 +183,7 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 			prep_node_for_display(node)
 
 			#node.history.status
-			print node.hostname
+			#print node.hostname
 
 			if node.history.status in ['down', 'offline']:
 				if node.plc_node_stats and node.plc_node_stats['last_contact'] != None:
diff --git a/web/MonitorWeb/monitorweb/templates/node_template.kid b/web/MonitorWeb/monitorweb/templates/node_template.kid
index 962b72b..795fdde 100644
--- a/web/MonitorWeb/monitorweb/templates/node_template.kid
+++ b/web/MonitorWeb/monitorweb/templates/node_template.kid
@@ -18,9 +18,6 @@ from links import *
 		<th>last_contact</th>
 	</span>
 	<span py:if="node is not None">
-<?python
-print dir(node)
-?>
                 <td py:content="node.plc_node_stats['node_id']">node_id</td>
 		<td nowrap="true">
 		  <a target="_top" href="${link('pcuview', hostname=node.hostname)}" py:content="node.hostname">your.host.org</a></td>
diff --git a/web/MonitorWeb/monitorweb/templates/nodelist.kid b/web/MonitorWeb/monitorweb/templates/nodelist.kid
index 62ac76c..2c3cd00 100644
--- a/web/MonitorWeb/monitorweb/templates/nodelist.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodelist.kid
@@ -17,9 +17,8 @@ from links import *
   </script>
 
   <center>
-  <b py:content="'BOOT-PROD: %d' % len([node for node in query if node.plc_node_stats['boot_state'] == 'boot'])"></b> | 
-  <b py:content="'BOOT-SAFEBOOT: %d' % len([node for node in query if node.plc_node_stats['boot_state'] == 'safeboot'])"></b> | 
-  <b py:content="'BOOT-REINSTALL: %d' % len([node for node in query if node.plc_node_stats['boot_state'] == 'reinstall'])"></b><br/>
+  <b py:content="'BOOT: %d' % len([node for node in query if node.observed_status == 'BOOT'])"></b> | 
+  <b py:content="'DOWN: %d' % len([node for node in query if node.observed_status == 'DOWN'])"></b><br/>
   </center>
 
 <table id="nodelist" cellpadding="0" border="0" class="plekit_table sortable-onload-2 colstyle-alt no-arrow paginationcallback-nodelist_paginator max-pages-10 paginate-25">