From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 13 Oct 2006 21:01:59 -0000
Subject: [Cluster-devel] conga/luci/cluster form-macros
Message-ID: <20061013210159.6748.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:	jparsons at sourceware.org	2006-10-13 21:01:59

Modified files:
	luci/cluster   : form-macros 

Log message:
	rest of fence types

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

--- conga/luci/cluster/form-macros	2006/10/11 20:57:07	1.82
+++ conga/luci/cluster/form-macros	2006/10/13 21:01:59	1.83
@@ -788,10 +788,20 @@
 <div metal:define-macro="fence-option-list">
 	<option name="fence_apc" value="fence_apc">APC Power Switch</option>
 	<option name="fence_wti" value="fence_wti">WTI Power Switch</option>
+	<option name="fence_brocade" value="fence_brocade">Brocade Fabric Switch</option>
+	<option name="fence_mcdata" value="fence_mcdata">McData SAN Switch</option>
+	<option name="fence_sanbox2" value="fence_sanbox2">QLogic SANbox2</option>
+	<option name="fence_vixel" value="fence_vixel">Vixel SAN Switch</option>
+	<option name="fence_gnbd" value="fence_gnbd">GNBD</option>
+	<option name="fence_egenera" value="fence_egenera">Egenera SAN Controller</option>
 	<option name="fence_ilo" value="fence_ilo">HP iLO</option>
-	<option name="fence_drac" value="fence_drac">Dell DRAC</option>
 	<option name="fence_rsa" value="fence_rsa">IBM RSA II</option>
+	<option name="fence_bladecenter" value="fence_bladecenter">IBM Blade Center</option>
+	<option name="fence_bullpap" value="fence_bullpap">Bull PAP</option>
+	<option name="fence_rps10" value="fence_rps10">RPS10 Serial Switch</option>
+	<option name="fence_drac" value="fence_drac">Dell DRAC</option>
 	<option name="fence_ipmilan" value="fence_ipmilan">IPMI Lan</option>
+	<option name="fence_manual" value="fence_manual">Manual Fencing</option>
 </div>
 
 <div metal:define-macro="fence-form-list">
@@ -799,143 +809,309 @@
 		<table>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"></td>
+				<td><input name="name" type="text"/></td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text"></td>
+				<td><input name="ip_addr" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"></td>
+				<td><input name="login" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" autocomplete="off" type="password">
+					<input name="password" autocomplete="off" type="password"/>
 				</td>
 			</tr>
 		</table>
-		<input type="hidden" name="fence_type" value="apc" />
+		<input type="hidden" name="fence_type" value="fence_apc" />
 	</div>
 
 	<div id="fence_wti" class="fencedev">
 		<table>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"></td>
+				<td><input name="name" type="text"/></td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text"></td>
+				<td><input name="ip_addr" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off">
+					<input name="password" type="password" autocomplete="off"/>
 				</td>
 			</tr>
 		</table>
-		<input type="hidden" name="fence_type" value="wti" />
+		<input type="hidden" name="fence_type" value="fence_wti" />
 	</div>
 
 	<div id="fence_ilo" class="fencedev">
 		<table>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"></td>
+				<td><input name="name" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Hostname</td>
-				<td><input name="hostname" type="text"></td>
+				<td><input name="hostname" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"></td>
+				<td><input name="login" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off">
+					<input name="password" type="password" autocomplete="off"/>
 				</td>
 			</tr>
 		</table>
-		<input type="hidden" name="fence_type" value="ilo" />
+		<input type="hidden" name="fence_type" value="fence_ilo" />
 	</div>
 
 	<div id="fence_drac" class="fencedev">
 		<table>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"></td>
+				<td><input name="name" type="text"/></td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text"></td>
+				<td><input name="ip_addr" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"></td>
+				<td><input name="login" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off">
+					<input name="password" type="password" autocomplete="off"/>
 				</td>
 		</table>
-		<input type="hidden" name="fence_type" value="drac" />
+		<input type="hidden" name="fence_type" value="fence_drac" />
 	</div>
 
 	<div id="fence_rsa" class="fencedev">
 		<table>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"></td>
+				<td><input name="name" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Hostname</td>
-				<td><input name="hostname" type="text"></td>
+				<td><input name="hostname" type="text"/></td>
+			</tr>
+			<tr>
+				<td>Login</td>
+				<td><input name="login" type="text"/></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="password" type="password" autocomplete="off"/>
+				</td>
+			</tr>
+		</table>
+		<input type="hidden" name="fence_type" value="fence_rsa" />
+	</div>
+
+	<div id="fence_brocade" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"/></td>
+			</tr>
+			<tr>
+				<td>IP Address</td>
+				<td><input name="ip_addr" type="text"/></td>
+			</tr>
+			<tr>
+				<td>Login</td>
+				<td><input name="login" type="text"/></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="password" type="password" autocomplete="off"/>
+				</td>
+			</tr>
+		</table>
+		<input type="hidden" name="fence_type" value="fence_brocade" />
+	</div>
+
+	<div id="fence_sanbox2" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"/></td>
+			</tr>
+			<tr>
+				<td>IP Address</td>
+				<td><input name="hostname" type="text"/></td>
+			</tr>
+			<tr>
+				<td>Login</td>
+				<td><input name="login" type="text"/></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="password" type="password" autocomplete="off"/>
+				</td>
+			</tr>
+		</table>
+		<input type="hidden" name="fence_type" value="fence_sanbox2" />
+	</div>
+
+	<div id="fence_vixel" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"/></td>
+			</tr>
+			<tr>
+				<td>IP Address</td>
+				<td><input name="ip_addr" type="text"/></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="password" type="password" autocomplete="off"/>
+				</td>
+			</tr>
+		</table>
+		<input type="hidden" name="fence_type" value="fence_vixel" />
+	</div>
+
+	<div id="fence_gnbd" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"/></td>
+			</tr>
+			<tr>
+				<td>Servers (whitespace separated list)</td>
+				<td><input name="servers" type="text"/></td>
+			</tr>
+		</table>
+		<input type="hidden" name="fence_type" value="fence_gnbd" />
+	</div>
+
+	<div id="fence_egenera" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"/></td>
+			</tr>
+			<tr>
+				<td>CServer</td>
+				<td><input name="cserver" type="text"/></td>
+			</tr>
+			<tr>
+				<td>ESH Path (Optional)</td>
+				<td><input name="login" type="text" Title="default is /opt/pan-mgr/bin/esh"/></td>
+			</tr>
+		</table>
+		<input type="hidden" name="fence_type" value="fence_egenera" />
+	</div>
+
+	<div id="fence_bladecenter" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"/></td>
+			</tr>
+			<tr>
+				<td>IP Address</td>
+				<td><input name="ip_addr" type="text" Title="IP Address or Hostname"/></td>
+			</tr>
+			<tr>
+				<td>Login</td>
+				<td><input name="login" type="text"/></td>
+			</tr>
+			<tr>
+				<td>Password</td>
+				<td>
+					<input name="password" type="password" autocomplete="off"/>
+				</td>
+			</tr>
+		</table>
+		<input type="hidden" name="fence_type" value="fence_bladecenter" />
+	</div>
+
+	<div id="fence_bullpap" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"/></td>
+			</tr>
+			<tr>
+				<td>IP Address</td>
+				<td><input name="ip_addr" type="text" Title="IP Address or Hostname"/></td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"></td>
+				<td><input name="login" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off">
+					<input name="password" type="password" autocomplete="off"/>
 				</td>
 			</tr>
 		</table>
-		<input type="hidden" name="fence_type" value="rsa" />
+		<input type="hidden" name="fence_type" value="fence_bullpap" />
+	</div>
+
+	<div id="fence_rps10" class="fencedev">
+		<table>
+			<tr>
+				<td>Name</td>
+				<td><input name="name" type="text"/></td>
+			</tr>
+			<tr>
+				<td>Device Name</td>
+				<td><input name="device" type="text"/></td>
+			</tr>
+			<tr>
+				<td>Port</td>
+				<td><input name="port" type="text"/></td>
+			</tr>
+		</table>
+		<input type="hidden" name="fence_type" value="fence_rps10"/>
 	</div>
 
 	<div id="fence_ipmilan" class="fencedev">
 		<table>
 			<tr>
 				<td>Name</td>
-				<td><input name="name" type="text"></td>
+				<td><input name="name" type="text"/></td>
 			</tr>
 			<tr>
 				<td>IP Address</td>
-				<td><input name="ip_addr" type="text"></td>
+				<td><input name="ip_addr" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Login</td>
-				<td><input name="login" type="text"></td>
+				<td><input name="login" type="text"/></td>
 			</tr>
 			<tr>
 				<td>Password</td>
 				<td>
-					<input name="password" type="password" autocomplete="off">
+					<input name="password" type="password" autocomplete="off"/>
 				</td>
 			</tr>
 			<tr>
-				<td>Auth Type</td>
-				<td><input name="auth_type" type="text"></td>
+				<td>Authentication Type</td>
+				<td><input name="auth_type" type="text" Title="Options are to leave blank for none, password, md2, or md5"/></td>
 			</tr>
 		</table>
-		<input type="hidden" name="fence_type" value="ipmilan" />
+		<input type="hidden" name="fence_type" value="fence_ipmilan" />
 	</div>
 </div>
 
@@ -1796,7 +1972,8 @@
 		set_page_title('Luci ??? cluster ??? fence devices');
 	</script>
 	<h2>Shared Fence Devices for Cluster: <span tal:content="request/clustername"/></h2>
-  <tal:block tal:define="global fencedevinfo python: here.getFenceInfo(modelb); global fencedevs python: fencedevinfo['fencedevs']"/>
+  <tal:block tal:define="global fencedevinfo python: here.getFenceInfo(modelb)"/>
+<tal:block tal:define="global fencedevs python: fencedevinfo['fencedevs']"/>
   <span tal:repeat="fencedev fencedevs">
    <h3>Name: <span tal:content="fencedev/name"/></h3>
    <h3>Agent type: <span tal:content="fencedev/agent"/></h3>