From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 16 Oct 2006 18:58:23 -0000
Subject: [Cluster-devel] conga/luci/cluster form-macros
Message-ID: <20061016185823.21091.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-10-16 18:58:22

Modified files:
	luci/cluster   : form-macros 

Log message:
	fill in fence device defaults when appropriate

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.86&r2=1.87

--- conga/luci/cluster/form-macros	2006/10/16 18:35:01	1.86
+++ conga/luci/cluster/form-macros	2006/10/16 18:58:22	1.87
@@ -808,22 +808,36 @@
 <div metal:define-macro="fence-form-apc">
 	<div id="fence_apc" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>APC Power Switch</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text"/></td>
+				<td>
+					<input name="ip_addr" type="text"
+						tal:attributes="cur_fendev/ipaddr | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"/></td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="cur_fencedev/login | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" autocomplete="off" type="password"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
 		</table>
@@ -834,22 +848,36 @@
 <div metal:define-macro="fence-form-mcdata">
 	<div id="fence_mcdata" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>McData SAN Switch</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text"/></td>
+				<td>
+					<input name="ip_addr" type="text"
+						tal:attributes="cur_fendev/ipaddr | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"/></td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="cur_fencedev/login | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" autocomplete="off" type="password"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
 		</table>
@@ -860,18 +888,29 @@
 <div metal:define-macro="fence-form-wti">
 	<div id="fence_wti" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>WTI Power Switch</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text"/></td>
+				<td>
+					<input name="ip_addr" type="text"
+						tal:attributes="cur_fendev/ipaddr | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
 		</table>
@@ -882,22 +921,36 @@
 <div metal:define-macro="fence-form-ilo">
 	<div id="fence_ilo" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>HP iLO</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Hostname</td>
-				<td><input name="hostname" type="text"/></td>
+				<td>
+					<input name="hostname" type="text"
+						tal:attributes="cur_fencedev/hostname | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"/></td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="cur_fencedev/login | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
 		</table>
@@ -908,22 +961,36 @@
 <div metal:define-macro="fence-form-drac">
 	<div id="fence_drac" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>Dell Drac</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text"/></td>
+				<td>
+					<input name="ip_addr" type="text"
+						tal:attributes="cur_fendev/ipaddr | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"/></td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="cur_fencedev/login | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 		</table>
 		<input type="hidden" name="fence_type" value="fence_drac" />
@@ -933,22 +1000,36 @@
 <div metal:define-macro="fence-form-rsa">
 	<div id="fence_rsa" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>IBM RSA II</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Hostname</td>
-				<td><input name="hostname" type="text"/></td>
+				<td>
+					<input name="hostname" type="text"
+						tal:attributes="cur_fencedev/hostname | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"/></td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="cur_fencedev/login | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
 		</table>
@@ -959,22 +1040,36 @@
 <div metal:define-macro="fence-form-brocade">
 	<div id="fence_brocade" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>Brocade Fabric Switch</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text"/></td>
+				<td>
+					<input name="ip_addr" type="text"
+						tal:attributes="cur_fendev/ipaddr | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"/></td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="cur_fencedev/login | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
 		</table>
@@ -985,9 +1080,16 @@
 <div metal:define-macro="fence-form-sanbox2">
 	<div id="fence_sanbox2" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>QLogic SANbox2</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
@@ -995,12 +1097,16 @@
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"/></td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="cur_fencedev/login | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
 		</table>
@@ -1011,18 +1117,29 @@
 <div metal:define-macro="fence-form-vixel">
 	<div id="fence_vixel" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>Vixel SAN Switch</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text"/></td>
+				<td>
+					<input name="ip_addr" type="text"
+						tal:attributes="cur_fendev/ipaddr | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
 		</table>
@@ -1033,13 +1150,23 @@
 <div metal:define-macro="fence-form-gnbd">
 	<div id="fence_gnbd" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>GNBD</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Servers (whitespace separated list)</td>
-				<td><input name="servers" type="text"/></td>
+				<td>
+					<input name="servers" type="text"
+						tal:attributes="cur_fencedev/servers | nothing" />
+				</td>
 			</tr>
 		</table>
 		<input type="hidden" name="fence_type" value="fence_gnbd" />
@@ -1049,17 +1176,30 @@
 <div metal:define-macro="fence-form-egenera">
 	<div id="fence_egenera" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>Egenera SAN Controller</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>CServer</td>
-				<td><input name="cserver" type="text"/></td>
+				<td>
+					<input name="cserver" type="text"
+						tal:attributes="cur_fencedev/cserver | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>ESH Path (Optional)</td>
-				<td><input name="login" type="text" Title="default is /opt/pan-mgr/bin/esh"/></td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="cur_fencedev/login | string: /opt/pan-mgr/bin/esh" />
+				</td>
 			</tr>
 		</table>
 		<input type="hidden" name="fence_type" value="fence_egenera" />
@@ -1069,22 +1209,36 @@
 <div metal:define-macro="fence-form-bladecenter">
 	<div id="fence_bladecenter" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>IBM Blade Center</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text" Title="IP Address or Hostname"/></td>
+				<td>
+					<input name="ip_addr" type="text"
+						tal:attributes="cur_fendev/ipaddr | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"/></td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="cur_fencedev/login | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
 		</table>
@@ -1095,22 +1249,36 @@
 <div metal:define-macro="fence-form-bullpap">
 	<div id="fence_bullpap" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>Bull PAP</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text" Title="IP Address or Hostname"/></td>
+				<td>
+					<input name="ip_addr" type="text"
+						tal:attributes="cur_fendev/ipaddr | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"/></td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="cur_fencedev/login | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
 		</table>
@@ -1121,17 +1289,30 @@
 <div metal:define-macro="fence-form-rps10">
 	<div id="fence_rps10" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>RPS10 Serial Switch</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Device Name</td>
-				<td><input name="device" type="text"/></td>
+				<td>
+					<input name="device" type="text"
+						tal:attributes="cur_fencedev/device | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Port</td>
-				<td><input name="port" type="text"/></td>
+				<td>
+					<input name="port" type="text"
+						tal:attributes="cur_fencedev/port| nothing" />
+				</td>
 			</tr>
 		</table>
 		<input type="hidden" name="fence_type" value="fence_rps10"/>
@@ -1141,22 +1322,36 @@
 <div metal:define-macro="fence-form-ipmilan">
 	<div id="fence_ipmilan" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>IPMI Lan</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text"/></td>
+				<td>
+					<input name="ip_addr" type="text"
+						tal:attributes="cur_fendev/ipaddr | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"/></td>
+				<td>
+					<input name="login" type="text"
+						tal:attributes="cur_fencedev/login | nothing" />
+				</td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off"/>
+					<input name="password" type="password" autocomplete="off"
+						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 			</tr>
 			<tr>
@@ -1171,9 +1366,16 @@
 <div metal:define-macro="fence-form-manual">
 	<div id="fence_manual" class="fencedev">
 		<table>
+			<tr tal:condition="exists: cur_fence_type">
+				<td><strong class="cluster">Fence Type</strong></td>
+				<td>Manual Fencing</td>
+			</tr>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"/></td>
+				<td>
+					<input name="name" type="text"
+						tal:attributes="cur_fencedev/name | nothing" />
+				</td>
 			</tr>
 			<input type="hidden" name="fence_type" value="fence_manual" />
 		</table>