X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Ftemplates%2Fnodeview.kid;h=dc2820ed6bb36321111f9517ac3459c239f31b15;hb=38888cc52d03e21d0290351d83516c2ab1e36f7f;hp=f1acbaed417b00a320ed6b86425679e2be88e2e8;hpb=21f8190281cfb38c3e24dfba6c89420830435f1f;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/templates/nodeview.kid b/web/MonitorWeb/monitorweb/templates/nodeview.kid
index f1acbae..dc2820e 100644
--- a/web/MonitorWeb/monitorweb/templates/nodeview.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodeview.kid
@@ -2,6 +2,8 @@
 <?python
 layout_params['page_title'] = "Monitor Node View"
 from monitor.util import diff_time
+from time import mktime
+from pcucontrol.reboot import pcu_name, model_to_object
 from links import *
 ?>
 <html	py:layout="'sitemenu.kid'"
@@ -18,32 +20,63 @@ from links import *
 					<th>Hostname</th>
 					<th>ping</th>
 					<!--th>ssh</th-->
-					<th>pcu</th>
 					<th>kernel</th>
+					<th>last_change</th>
 					<th>last_contact</th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr py:for="i,node in enumerate(nodequery)" class="${i%2 and 'odd' or 'even'}" >
 					<td></td>
-					<td><a class="ext-link" href="${plc_site_link_id(node.plc_node_stats['site_id'])}">
+					<td><a class="ext-link" href="${plc_site_uri_id(node.plc_node_stats['site_id'])}">
 							<span class="icon">${node.loginbase}</span></a>
 					</td>
 					<td id="node-${node.observed_status}" nowrap="true" >
-						<a class="ext-link" href="${plc_node_link(node.hostname)}">
+						<a class="ext-link" href="${plc_node_uri(node.hostname)}">
 							<span class="icon">${node.hostname}</span></a>
 					</td>
 					<td py:content="node.ping_status"></td>
-					<td py:if="node.pcu_short_status != 'none'" id="status-${node.pcu_short_status}">
-						<a href="pcuview?pcuid=${node.plc_node_stats['pcu_ids']}">${node.pcu_short_status}</a></td>
-					<td py:if="node.pcu_short_status == 'none'" id="status-${node.pcu_short_status}">
-						${node.pcu_short_status}</td>
 					<td nowrap="true" py:content="node.kernel"></td>
+					<td py:content="diff_time(mktime(node.history.last_changed.timetuple()))"></td>
 					<td py:content="diff_time(node.plc_node_stats['last_contact'])"></td>
 				</tr>
 			</tbody>
 		</table>
-    <h3 py:if="node.pcu_short_status != 'none'">PCU Status</h3>
+    <h3 py:if="node.pcu is not None">Controlling PCU</h3>
+		<table py:if="node.pcu is not None" id="sortable_table" class="datagrid" border="1" width="100%">
+			<thead>
+				<tr>
+					<th mochi:format="int"></th>
+					<th>PCU Name</th>
+					<th>Model</th>
+					<th width="80%">Test Results</th>
+				</tr>
+			</thead>
+			<tbody>
+				<?python pcu = node.pcu ?>
+				<tr>
+					<td></td>
+					<td nowrap="true" >
+						<a class="ext-link" href="${plc_pcu_uri_id(pcu.plc_pcu_stats['pcu_id'])}">
+							<span class="icon">${pcu_name(pcu.plc_pcu_stats)}</span>
+						</a>
+					</td>
+					<td py:content="pcu.plc_pcu_stats['model']"></td>
+					<td width="20%" nowrap='true' align='center' id="status-${node.pcu_short_status}">
+						<div id="links">
+							<a class="info" py:if="'error' in node.pcu_short_status" 
+								href="${link('pcuview', pcuid=node.plc_pcuid)}">
+								Error<span><pre>${node.pcu.reboot_trial_status}</pre></span></a>
+							<a py:if="'error' not in node.pcu_short_status and 'none' not in node.pcu_short_status" 
+								href="${link('pcuview', pcuid=node.plc_pcuid)}"
+								py:content="node.pcu_short_status">Reboot Status</a>
+							<span py:if="'none' in node.pcu_short_status" 
+								py:content="node.pcu_short_status">Reboot Status</span>
+						</div>
+					</td>
+				</tr>
+			</tbody>
+		</table>
     <h3>Actions Taken</h3>
   </div>
 
