[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

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



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe sourceware org	2006-12-04 22:59:57

Modified files:
	luci/cluster   : form-macros 

Log message:
	more fencing updates

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

--- conga/luci/cluster/form-macros	2006/12/01 14:56:53	1.118
+++ conga/luci/cluster/form-macros	2006/12/04 22:59:56	1.119
@@ -1174,6 +1174,20 @@
 				</td>
 			</tr>
 		</table>
+		<div name="instances">
+			<tal:block tal:condition="exists: cur_fence_instances">
+				<tal:block tal:repeat="cur_fence_instance cur_fence_instances">
+					<tal:block
+						metal:use-macro="here/form-macros/macros/fence-instance-form-apc" />
+				</tal:block>
+			</tal:block>
+		</div>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="sharable" value="1" />
 		<input type="hidden" name="fence_type" value="fence_apc" />
 	</div>
 </div>
@@ -1216,6 +1230,20 @@
 				</td>
 			</tr>
 		</table>
+		<div name="instances">
+			<tal:block tal:condition="exists: cur_fence_instances">
+				<tal:block tal:repeat="cur_fence_instance cur_fence_instances">
+					<tal:block
+						metal:use-macro="here/form-macros/macros/fence-instance-form-mcdata" />
+				</tal:block>
+			</tal:block>
+		</div>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="sharable" value="1" />
 		<input type="hidden" name="fence_type" value="fence_mcdata" />
 	</div>
 </div>
@@ -1251,6 +1279,20 @@
 				</td>
 			</tr>
 		</table>
+		<div name="instances">
+			<tal:block tal:condition="exists: cur_fence_instances">
+				<tal:block tal:repeat="cur_fence_instance cur_fence_instances">
+					<tal:block
+						metal:use-macro="here/form-macros/macros/fence-instance-form-wti" />
+				</tal:block>
+			</tal:block>
+		</div>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="sharable" value="1" />
 		<input type="hidden" name="fence_type" value="fence_wti" />
 	</div>
 </div>
@@ -1293,6 +1335,11 @@
 				</td>
 			</tr>
 		</table>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
 		<input type="hidden" name="fence_type" value="fence_ilo" />
 	</div>
 </div>
@@ -1334,6 +1381,11 @@
 						tal:attributes="value cur_fencedev/passwd | nothing" />
 				</td>
 		</table>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
 		<input type="hidden" name="fence_type" value="fence_drac" />
 	</div>
 </div>
@@ -1376,6 +1428,11 @@
 				</td>
 			</tr>
 		</table>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
 		<input type="hidden" name="fence_type" value="fence_rsa" />
 	</div>
 </div>
@@ -1418,6 +1475,20 @@
 				</td>
 			</tr>
 		</table>
+		<div name="instances">
+			<tal:block tal:condition="exists: cur_fence_instances">
+				<tal:block tal:repeat="cur_fence_instance cur_fence_instances">
+					<tal:block
+						metal:use-macro="here/form-macros/macros/fence-instance-form-brocade" />
+				</tal:block>
+			</tal:block>
+		</div>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="sharable" value="1" />
 		<input type="hidden" name="fence_type" value="fence_brocade" />
 	</div>
 </div>
@@ -1457,6 +1528,20 @@
 				</td>
 			</tr>
 		</table>
+		<div name="instances">
+			<tal:block tal:condition="exists: cur_fence_instances">
+				<tal:block tal:repeat="cur_fence_instance cur_fence_instances">
+					<tal:block
+						metal:use-macro="here/form-macros/macros/fence-instance-form-sanbox2" />
+				</tal:block>
+			</tal:block>
+		</div>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="sharable" value="1" />
 		<input type="hidden" name="fence_type" value="fence_sanbox2" />
 	</div>
 </div>
@@ -1492,6 +1577,20 @@
 				</td>
 			</tr>
 		</table>
+		<div name="instances">
+			<tal:block tal:condition="exists: cur_fence_instances">
+				<tal:block tal:repeat="cur_fence_instance cur_fence_instances">
+					<tal:block
+						metal:use-macro="here/form-macros/macros/fence-instance-form-brocade" />
+				</tal:block>
+			</tal:block>
+		</div>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="sharable" value="1" />
 		<input type="hidden" name="fence_type" value="fence_vixel" />
 	</div>
 </div>
@@ -1520,6 +1619,20 @@
 				</td>
 			</tr>
 		</table>
+		<div name="instances">
+			<tal:block tal:condition="exists: cur_fence_instances">
+				<tal:block tal:repeat="cur_fence_instance cur_fence_instances">
+					<tal:block
+						metal:use-macro="here/form-macros/macros/fence-instance-form-gnbd" />
+				</tal:block>
+			</tal:block>
+		</div>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="sharable" value="1" />
 		<input type="hidden" name="fence_type" value="fence_gnbd" />
 	</div>
 </div>
@@ -1555,6 +1668,20 @@
 				</td>
 			</tr>
 		</table>
+		<div name="instances">
+			<tal:block tal:condition="exists: cur_fence_instances">
+				<tal:block tal:repeat="cur_fence_instance cur_fence_instances">
+					<tal:block
+						metal:use-macro="here/form-macros/macros/fence-instance-form-egenera" />
+				</tal:block>
+			</tal:block>
+		</div>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="sharable" value="1" />
 		<input type="hidden" name="fence_type" value="fence_egenera" />
 	</div>
 </div>
@@ -1597,6 +1724,11 @@
 				</td>
 			</tr>
 		</table>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
 		<input type="hidden" name="fence_type" value="fence_bladecenter" />
 	</div>
 </div>
@@ -1639,6 +1771,20 @@
 				</td>
 			</tr>
 		</table>
+		<div name="instances">
+			<tal:block tal:condition="exists: cur_fence_instances">
+				<tal:block tal:repeat="cur_fence_instance cur_fence_instances">
+					<tal:block
+						metal:use-macro="here/form-macros/macros/fence-instance-form-bullpap" />
+				</tal:block>
+			</tal:block>
+		</div>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="sharable" value="1" />
 		<input type="hidden" name="fence_type" value="fence_bullpap" />
 	</div>
 </div>
@@ -1670,11 +1816,16 @@
 				<td>Port</td>
 				<td>
 					<input name="port" type="text"
-						tal:attributes="value cur_fencedev/port| nothing" />
+						tal:attributes="value cur_fencedev/port | nothing" />
 				</td>
 			</tr>
 		</table>
-		<input type="hidden" name="fence_type" value="fence_rps10"/>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="fence_type" value="fence_rps10" />
 	</div>
 </div>
 
@@ -1682,7 +1833,7 @@
 	tal:attributes="id cur_fencedev/name | nothing">
 
 	<div id="fence_xvm" class="fencedev">
-	<table>
+		<table>
 			<tr>
 				<td><strong class="cluster">Fence Type</strong></td>
 				<td>Virtual Machine Fencing</td>
@@ -1694,7 +1845,22 @@
 						tal:attributes="value cur_fencedev/name | nothing" />
 				</td>
 			</tr>
-  </table>	
+		</table>	
+		<div name="instances">
+			<tal:block tal:condition="exists: cur_fence_instances">
+				<tal:block tal:repeat="cur_fence_instance cur_fence_instances">
+					<tal:block
+						metal:use-macro="here/form-macros/macros/fence-instance-form-xvm" />
+				</tal:block>
+			</tal:block>
+		</div>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="sharable" value="1" />
+		<input type="hidden" name="fence_type" value="xvm" />
 	</div>
 </div>
 
@@ -1702,7 +1868,7 @@
 	tal:attributes="id cur_fencedev/name | nothing">
 
 	<div id="fence_scsi" class="fencedev">
-	<table>
+		<table>
 			<tr>
 				<td><strong class="cluster">Fence Type</strong></td>
 				<td>SCSI Reservation Fencing</td>
@@ -1714,7 +1880,14 @@
 						tal:attributes="value cur_fencedev/name | nothing" />
 				</td>
 			</tr>
-  </table>	
+		</table>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="sharable" value="1" />
+		<input type="hidden" name="fence_type" value="scsi" />
 	</div>
 </div>
 
@@ -1760,6 +1933,11 @@
 				<td><input name="auth_type" type="text" Title="Options are to leave blank for none, password, md2, or md5"/></td>
 			</tr>
 		</table>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
 		<input type="hidden" name="fence_type" value="fence_ipmilan" />
 	</div>
 </div>
@@ -1780,8 +1958,13 @@
 						tal:attributes="value cur_fencedev/name | nothing" />
 				</td>
 			</tr>
-			<input type="hidden" name="fence_type" value="fence_manual" />
 		</table>
+		<tal:block tal:condition="exists: cur_fencedev">
+			<input type="hidden" name="existing_device" value="1" />
+			<input type="hidden" name="old_name"
+				tal:attributes="value cur_fencedev/name | nothing" />
+		</tal:block>
+		<input type="hidden" name="fence_type" value="fence_manual" />
 	</div>
 </div>
 
@@ -1863,172 +2046,206 @@
 </div>
 
 <div metal:define-macro="fence-instance-form-apc">
-	<div id="fence_apc_instance" class="fencedev_instance">
+	<div id="fence_apc_instance" name="fence_apc" class="fencedev_instance">
 		<table>
 			<tr>
 				<td>Port</td>
 				<td>
 					<input name="port" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/port | nothing" />
 				</td>
 			</tr>
 			<tr>
 				<td>Switch</td>
 				<td>
 					<input name="switch" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/switch | nothing" />
 				</td>
 			</tr>
+			<input tal:condition="exists: cur_instance"
+				type="hidden" name="existing_instance" value="1" />
+			<input type="hidden" name="parent_fencedev" value="" />
 		</table>
 	</div>
 </div>
 
 <div metal:define-macro="fence-instance-form-egenera">
-	<div id="fence_egenera_instance" class="fencedev_instance">
+	<div id="fence_egenera_instance" name="fence_egenera" class="fencedev_instance">
 		<table>
 			<tr>
 				<td>lpan</td>
 				<td>
 					<input name="lpan" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/lpan | nothing" />
 				</td>
 			</tr>
 			<tr>
 				<td>pserver</td>
 				<td>
 					<input name="pserver" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/pserver | nothing" />
 				</td>
 			</tr>
+			<input tal:condition="exists: cur_instance"
+				type="hidden" name="existing_instance" value="1" />
+			<input type="hidden" name="parent_fencedev" value="" />
 		</table>
 	</div>
 </div>
 
 <div metal:define-macro="fence-instance-form-wti">
-	<div id="fence_wti_instance" class="fencedev_instance">
+	<div id="fence_wti_instance" name="fence_wti" class="fencedev_instance">
 		<table>
 			<tr>
 				<td>Port</td>
 				<td>
 					<input name="port" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/port | nothing" />
 				</td>
 			</tr>
+			<input tal:condition="exists: cur_instance"
+				type="hidden" name="existing_instance" value="1" />
+			<input type="hidden" name="parent_fencedev" value="" />
 		</table>
 	</div>
 </div>
 
 <div metal:define-macro="fence-instance-form-brocade">
-	<div id="fence_brocade_instance" class="fencedev_instance">
+	<div id="fence_brocade_instance" name="fence_brocade" class="fencedev_instance">
 		<table>
 			<tr>
 				<td>Port</td>
 				<td>
 					<input name="port" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/port | nothing" />
 				</td>
 			</tr>
+			<input tal:condition="exists: cur_instance"
+				type="hidden" name="existing_instance" value="1" />
+			<input type="hidden" name="parent_fencedev" value="" />
 		</table>
 	</div>
 </div>
 
 <div metal:define-macro="fence-instance-form-vixel">
-	<div id="fence_vixel_instance" class="fencedev_instance">
+	<div id="fence_vixel_instance" name="fence_vixel" class="fencedev_instance">
 		<table>
 			<tr>
 				<td>Port</td>
 				<td>
 					<input name="port" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/port | nothing" />
 				</td>
 			</tr>
+			<input tal:condition="exists: cur_instance"
+				type="hidden" name="existing_instance" value="1" />
+			<input type="hidden" name="parent_fencedev" value="" />
 		</table>
 	</div>
 </div>
 
 <div metal:define-macro="fence-instance-form-sanbox2">
-	<div id="fence_sanbox2_instance" class="fencedev_instance">
+	<div id="fence_sanbox2_instance" name="fence_sanbox2" class="fencedev_instance">
 		<table>
 			<tr>
 				<td>Port</td>
 				<td>
 					<input name="port" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/port | nothing" />
 				</td>
 			</tr>
+			<input tal:condition="exists: cur_instance"
+				type="hidden" name="existing_instance" value="1" />
+			<input type="hidden" name="parent_fencedev" value="" />
 		</table>
 	</div>
 </div>
 
 <div metal:define-macro="fence-instance-form-mcdata">
-	<div id="fence_mcdata_instance" class="fencedev_instance">
+	<div id="fence_mcdata_instance" name="fence_mcdata" class="fencedev_instance">
 		<table>
 			<tr>
 				<td>Port</td>
 				<td>
 					<input name="port" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/port | nothing" />
 				</td>
 			</tr>
+			<input tal:condition="exists: cur_instance"
+				type="hidden" name="existing_instance" value="1" />
+			<input type="hidden" name="parent_fencedev" value="" />
 		</table>
 	</div>
 </div>
 
 <div metal:define-macro="fence-instance-form-gndb">
-	<div id="fence_gnbd_instance" class="fencedev_instance">
+	<div id="fence_gnbd_instance" name="fence_gnbd" class="fencedev_instance">
 		<table>
 			<tr>
 				<td>IP Address</td>
 				<td>
 					<input name="ipaddress" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/ipaddress | nothing" />
 				</td>
 			</tr>
+			<input tal:condition="exists: cur_instance"
+				type="hidden" name="existing_instance" value="1" />
+			<input type="hidden" name="parent_fencedev" value="" />
 		</table>
 	</div>
 </div>
 
 <div metal:define-macro="fence-instance-form-bladecenter">
-	<div id="fence_bladecenter_instance" class="fencedev_instance">
+	<div id="fence_bladecenter_instance" name="fence_bladecenter" class="fencedev_instance">
 		<table>
 			<tr>
 				<td>Blade</td>
 				<td>
 					<input name="ipaddress" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/ipaddress | nothing" />
 				</td>
 			</tr>
+			<input tal:condition="exists: cur_instance"
+				type="hidden" name="existing_instance" value="1" />
+			<input type="hidden" name="parent_fencedev" value="" />
 		</table>
 	</div>
 </div>
 
 <div metal:define-macro="fence-instance-form-bullpap">
-	<div id="fence_bullpap_instance" class="fencedev_instance">
+	<div id="fence_bullpap_instance" name="fence_bullpap" class="fencedev_instance">
 		<table>
 			<tr>
 				<td>Domain</td>
 				<td>
 					<input name="domain" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/domain | nothing" />
 				</td>
 			</tr>
+			<input tal:condition="exists: cur_instance"
+				type="hidden" name="existing_instance" value="1" />
+			<input type="hidden" name="parent_fencedev" value="" />
 		</table>
 	</div>
 </div>
 
 <div metal:define-macro="fence-instance-form-xvm">
-	<div id="fence_xvm_instance" class="fencedev_instance">
+	<div id="fence_xvm_instance" name="fence_xvm" class="fencedev_instance">
 		<table>
 			<tr>
 				<td>Domain</td>
 				<td>
 					<input name="domain" type="text"
-						tal:attributes="value nothing" />
+						tal:attributes="value cur_instance/domain | nothing" />
 				</td>
 			</tr>
+			<input tal:condition="exists: cur_instance"
+				type="hidden" name="existing_instance" value="1" />
+			<input type="hidden" name="parent_fencedev" value="" />
 		</table>
 	</div>
 </div>
+
 <div metal:define-macro="fence-instance-form-list">
 	<tal:block
 		metal:use-macro="here/form-macros/macros/fence-instance-form-apc" />


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]