From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 3 Nov 2006 19:13:58 -0000
Subject: [Cluster-devel] conga/luci cluster/form-macros cluster/index_h ...
Message-ID: <20061103191358.28489.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-11-03 19:13:58

Modified files:
	luci/cluster   : form-macros index_html 
	luci/homebase  : homebase_common.js 
	luci/site/luci/Extensions: cluster_adapters.py 

Log message:
	add an advanced configuration panel with openais params

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.92&r2=1.93
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.24&r2=1.25
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/homebase_common.js.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.141&r2=1.142

--- conga/luci/cluster/form-macros	2006/10/31 13:23:09	1.92
+++ conga/luci/cluster/form-macros	2006/11/03 19:13:57	1.93
@@ -84,7 +84,7 @@
 			<a href=""
 				tal:attributes="href cstatus/clucfg | nothing;
 								class python: 'cluster ' + cluster_status;"
-				tal:content="cstatus/clusteralias | string: [unknown]" />
+				tal:content="cstatus/clusteralias | string:[unknown]" />
 		</td>
 
 		<td class="cluster cluster_action">
@@ -397,7 +397,8 @@
 			<input type="hidden" name="pagetype"
 				tal:attributes="value request/pagetype | request/form/pagetype"
 			/>
-			<input type="hidden" name="configtype" value="general" />
+		<input type="hidden" name="configtype" value="general" />
+
 		<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
 			<thead class="systemsTable">
 				<tr class="systemsTable"><td class="systemsTable" colspan="1">
@@ -423,8 +424,252 @@
 					</td>
 				</tr>
 			</tbody>
+		</table>
 
-			<tfoot class="systemsTable">
+		<table tal:condition="python: os_version and os_version == 'rhel5'">
+			<tr class="systemsTable">
+				<td class="systemsTable" colspan="2">
+					<img src="/luci/cluster/arrow_right.png" alt="[+]"
+						onclick="toggle_visible(this, 'genprops_advanced', 'genprops_advanced_label')">
+					<span id="genprops_advanced_label">Show</span>
+					advanced cluster properties
+				</td>
+			</tr>
+
+			<tr class="systemsTable invisible" id="genprops_advanced">
+				<td class="systemsTable" colspan="2">
+					<table class="systemsTable">
+						<tr class="systemsTable">
+							<td class="systemsTable">Secure Authentication</td>
+							<td class="systemsTable">
+								<input type="checkbox" name="secauth" checked="checked" />
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Redundant Ring Protocol Mode
+							</td>
+							<td class="systemsTable">
+								<select name="text" name="ais_rrp">
+									<option value="none">
+										None
+									</option>
+									<option value="active">
+										Active
+									</option>
+									<option value="passive">
+										Passive
+									</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Network MTU
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="netmtu"
+									tal:attributes="value string:1500" />
+							</td>
+						</tr>
+
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Number of Threads
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10" name="netmtu"
+									tal:attributes="value string:0" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Virtual Synchrony Type
+							</td>
+							<td class="systemsTable">
+								<select name="vfstype">
+									<option value="none">
+										None
+									</option>
+									<option value="ykd">
+										YKD
+									</option>
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Token Timeout (ms)
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10" name="token"
+									tal:attributes="value string:5000" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Token Retransmit (ms)
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="token_retransmit"
+									tal:attributes="value string:238" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Hold Token Timeout (ms)
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10" name="hold"
+									tal:attributes="value string:180" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Number of retransmits before loss
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="retransmits_before_loss"
+									tal:attributes="value string:4" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Join Timeout (ms)
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10" name="join"
+									tal:attributes="value string:100" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Consensus Timeout (ms)
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="consensus"
+									tal:attributes="value string:100" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Merge Detection Timeout (ms)
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="merge"
+									tal:attributes="value string:200" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Interface Down Check Timeout (ms)
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="downcheck"
+									tal:attributes="value string:1000" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Fail to Receive Constant
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="fail_to_recv_const"
+									tal:attributes="value string:50" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Rotations with no multicast traffic before merge detection timeout is started.
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="seqno_unchanged_const"
+									tal:attributes="value string:30" />
+							</td>
+						</tr>
+
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Number of Heartbeat Failures Allowed
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="heartbeat_failures_allowed"
+									tal:attributes="value string:0" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Maximum Network Delay (ms)
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="max_network_delay"
+									tal:attributes="value string:50" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Window Size
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="window_size"
+									tal:attributes="value string:50" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								Maximum Messages
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="max_messages"
+									tal:attributes="value string:17" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								RRP Problem Count Timeout (ms)
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="rrp_problem_count_timeout"
+									tal:attributes="value string:1000" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								RRP Problem Count Threshold
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="rrp_problem_count_threshold"
+									tal:attributes="value string:20" />
+							</td>
+						</tr>
+						<tr class="systemsTable">
+							<td class="systemsTable">
+								RRP Token Expired Timeout
+							</td>
+							<td class="systemsTable">
+								<input type="text" size="10"
+									name="rrp_token_expired_timeout"
+									tal:attributes="value string:47" />
+							</td>
+						</tr>
+					</table>
+				</td></tr>
+			</table>
+
+			<table class="systemsTable">
 				<tr class="systemsTable">
 					<td class="systemsTable" colspan="2">
 						<div class="systemsTableEnd">
@@ -433,8 +678,7 @@
 						</div>
 					</td>
 				</tr>
-			</tfoot>
-		</table>
+			</table>
 		</form>
 	</div>
 
@@ -1198,7 +1442,7 @@
 				<td>ESH Path (Optional)</td>
 				<td>
 					<input name="login" type="text"
-						tal:attributes="cur_fencedev/login | string: /opt/pan-mgr/bin/esh" />
+						tal:attributes="cur_fencedev/login | string:/opt/pan-mgr/bin/esh" />
 				</td>
 			</tr>
 		</table>
@@ -1628,8 +1872,8 @@
 						<select class="node" name="gourl">
 							<option value="">Choose a Task...</option>
 							<option tal:attributes="value nd/jl_url">
-								<span tal:condition="python: nd['status'] == '0'" tal:replace="string: Have node leave cluster" />
-								<span tal:condition="python: nd['status'] == '1'" tal:replace="string: Have node join cluster" />
+								<span tal:condition="python: nd['status'] == '0'" tal:replace="string:Have node leave cluster" />
+								<span tal:condition="python: nd['status'] == '1'" tal:replace="string:Have node join cluster" />
 							</option>
 							<option value="">----------</option>
 							<option tal:attributes="value nd/fence_it_url">Fence this node</option>
@@ -1743,7 +1987,7 @@
 				value request/form/clusterName | request/clustername | nothing"
 		/>
 
-		<h2>Add a node to <span tal:replace="request/form/clusterName | request/clustername | string: the cluster" /></h2>
+		<h2>Add a node to <span tal:replace="request/form/clusterName | request/clustername | string:the cluster" /></h2>
 
 		<table id="systemsTable" class="systemsTable" border="0" cellspacing="0">
 			<thead class="systemsTable">
@@ -1866,7 +2110,7 @@
 							This service is stopped
 						</tal:block>
 					</div>
-					<p>Autostart is <span tal:condition="not: autostart" tal:replace="string: not" /> enabled for this service</p>
+					<p>Autostart is <span tal:condition="not: autostart" tal:replace="string:not" /> enabled for this service</p>
 				</td>
 			</tr>
 
--- conga/luci/cluster/index_html	2006/11/01 20:43:39	1.24
+++ conga/luci/cluster/index_html	2006/11/03 19:13:57	1.25
@@ -39,8 +39,8 @@
       <span tal:define="ri_agent python:here.getRicciAgentForCluster(request)">
 
         <span tal:define="resmap python:here.getClusterOS(ri_agent);
-                          global isVirtualized resmap/isVirtualized;
-                          global os_version resmap/os;"/>
+                          global isVirtualized resmap/isVirtualized | nothing;
+                          global os_version resmap/os | nothing"/>
       </span>
       <span tal:define="global isBusy python:here.isClusterBusy(request)"/>
       <span tal:define="global firsttime request/busyfirst |nothing"/>
--- conga/luci/homebase/homebase_common.js	2006/10/04 17:24:58	1.13
+++ conga/luci/homebase/homebase_common.js	2006/11/03 19:13:57	1.14
@@ -8,6 +8,35 @@
 		ielem.className = ielem.className.replace(/ formerror/, '');
 }
 
+function toggle_visible(img_obj, elem_id, label_id) {
+	var elem = document.getElementById(elem_id)
+	if (!elem)
+		return (-1);
+
+	var old_state = !!!elem.className.match(/invisible/i);
+
+	if (label_id) {
+		var label = document.getElementById(label_id);
+		if (!label)
+			return (-1);
+		if (old_state)
+			label.innerHTML = 'Show';
+		else
+			label.innerHTML = 'Hide';
+	}
+
+	if (old_state) {
+		img_obj.src = 'arrow_right.png';
+		img_obj.alt = '[-]';
+		elem.className += ' invisible';
+	} else {
+		img_obj.src = 'arrow_down.png';
+		img_obj.alt = '[+]';
+		elem.className = elem.className.replace(/invisible/i,'');
+	}
+	return (0);
+}
+
 function is_valid_int(str, min, max) {
 	if (str.match(/[^0-9 -]/))
 		return (0);
--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/11/03 01:24:56	1.141
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/11/03 19:13:57	1.142
@@ -2618,7 +2618,7 @@
       nodename_resolved = resolve_nodename(self, clustername, name)
     except:
       luci_log.debug_verbose('Unable to resolve node name %s/%s' \
-          % (nodename, clustername))
+          % (name, clustername))
       nodename_resolved = name 
 
     map['logurl'] = '/luci/logs?nodename=' + nodename_resolved + '&clustername=' + clustername