[Cluster-devel] conga/luci/cluster form-macros index_html

[jparsons at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2006-10-04 16:10:22

Modified files:
	luci/cluster   : form-macros index_html 

Log message:
	minor additions

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.75&r2=1.76
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.16&r2=1.17

--- conga/luci/cluster/form-macros	2006/10/02 20:21:47	1.75
+++ conga/luci/cluster/form-macros	2006/10/04 16:10:22	1.76
@@ -893,6 +893,7 @@
 		global ricci_agent python: here.getRicciAgentForCluster(request);
 		global nodestatus python: here.getClusterStatus(ricci_agent);
 		global nodeinfo python: here.getNodeInfo(modelb, nodestatus, request);
+		global fenceinfo python: here.getFenceInfo(modelb, request);
 		global status_class python: 'node_' + (nodeinfo['nodestate'] == '0' and 'active' or (nodeinfo['nodestate'] == '1' and 'inactive' or 'unknown'));
 		global cluster_node_status_str python: (nodeinfo['nodestate'] == '0' and 'Cluster member' or (nodeinfo['nodestate'] == '1' and 'Currently not a cluster participant' or 'This node is not responding'));"
 	/>
@@ -1022,6 +1023,10 @@
 	</div>
 
 	<h3>Fencing</h3>
+  <span tal:define="global fencelevelone python:fenceinfo[0];
+                    global fenceleveltwo python:fenceinfo[1]"/>
+  <h4>Main fencing has <span tal:content="python:len(fencelevelone)"/> fences</h4>
+  <h4>Backup fencing has <span tal:content="python:len(fenceleveltwo)"/> fences</h4>
 	<table id="fence_devices" class="cluster node fencedev">
 		<tfoot class="fencedev">
 		<tr class="cluster node fencedev"><td class="cluster node fencedev">
--- conga/luci/cluster/index_html	2006/09/27 22:24:11	1.16
+++ conga/luci/cluster/index_html	2006/10/04 16:10:22	1.17
@@ -35,6 +35,11 @@
     <meta googaa="ooo"/>
     </span>
     <span tal:condition="hascluster">
+      <span tal:define="ri_agent python:here.getRicciAgentForCluster(request)">
+        <span tal:define="resmap python:here.getClusterOS(ri_agent,request);
+                          global isVirtualized resmap/isVirtualized;
+                          global os_version resmap/os;"/>
+      </span>
       <span tal:define="global isBusy python:here.isClusterBusy(request)"/>
       <span tal:define="global firsttime request/busyfirst |nothing"/>
       <span tal:condition="firsttime">
@@ -44,12 +49,7 @@
       <span tal:define="global busy isBusy/busy |nothing"/>
        <span tal:condition="busy">
         <span tal:define="global busywaiting python:True"/>
-        <meta http-equiv="refresh" content="" tal:attributes="content isBusy/refreshurl"/>
-        <span tal:define="ri_agent python:here.getRicciAgent(request/clustername)">
-        <span tal:define="resmap python:here.getClusterOS(ri_agent);
-                          global isVirtualized resmap/isVirtualized;
-                          global os_version resmap/os;"/>
-        </span>
+        <meta http-equiv="refresh" content="" tal:attributes="content isBusy/refreshurl"/> 
        </span>
     </span>
       <tal:comment replace="nothing"> A slot where you can insert elements in the header from a template </tal:comment>