[Cluster-devel] conga/luci/cluster form-macros index_html
rmccabe at sourceware.org
rmccabe at sourceware.org
Mon Nov 27 19:56:13 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-11-27 19:56:12
Modified files:
luci/cluster : form-macros index_html
Log message:
add fence instance forms
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.107&r2=1.108
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.27&r2=1.28
--- conga/luci/cluster/form-macros 2006/11/20 20:21:34 1.107
+++ conga/luci/cluster/form-macros 2006/11/27 19:56:12 1.108
@@ -1115,6 +1115,8 @@
<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_xvm" value="fence_xvm">Virtual Machine Fencing</option>
+ <option name="fence_scsi" value="fence_scsi">SCSI Fencing</option>
<option name="fence_manual" value="fence_manual">Manual Fencing</option>
</div>
@@ -1129,21 +1131,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1169,21 +1171,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fendev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1209,14 +1211,14 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
@@ -1242,21 +1244,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>Hostname</td>
<td>
<input name="hostname" type="text"
- tal:attributes="cur_fencedev/hostname | nothing" />
+ tal:attributes="value cur_fencedev/hostname | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1282,21 +1284,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1321,21 +1323,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>Hostname</td>
<td>
<input name="hostname" type="text"
- tal:attributes="cur_fencedev/hostname | nothing" />
+ tal:attributes="value cur_fencedev/hostname | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1361,21 +1363,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1401,7 +1403,7 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
@@ -1412,7 +1414,7 @@
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1438,14 +1440,14 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
@@ -1471,14 +1473,14 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>Servers (whitespace separated list)</td>
<td>
<input name="servers" type="text"
- tal:attributes="cur_fencedev/servers | nothing" />
+ tal:attributes="value cur_fencedev/servers | nothing" />
</td>
</tr>
</table>
@@ -1497,21 +1499,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>CServer</td>
<td>
<input name="cserver" type="text"
- tal:attributes="cur_fencedev/cserver | nothing" />
+ tal:attributes="value cur_fencedev/cserver | nothing" />
</td>
</tr>
<tr>
<td>ESH Path (Optional)</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | string:/opt/pan-mgr/bin/esh" />
+ tal:attributes="value cur_fencedev/login | string:/opt/pan-mgr/bin/esh" />
</td>
</tr>
</table>
@@ -1530,21 +1532,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1570,21 +1572,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1610,21 +1612,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>Device Name</td>
<td>
<input name="device" type="text"
- tal:attributes="cur_fencedev/device | nothing" />
+ tal:attributes="value cur_fencedev/device | nothing" />
</td>
</tr>
<tr>
<td>Port</td>
<td>
<input name="port" type="text"
- tal:attributes="cur_fencedev/port| nothing" />
+ tal:attributes="value cur_fencedev/port| nothing" />
</td>
</tr>
</table>
@@ -1632,6 +1634,18 @@
</div>
</div>
+<div metal:define-macro="fence-form-xvm">
+ <div id="fence_xvm" class="fencedev">
+ -
+ </div>
+</div>
+
+<div metal:define-macro="fence-form-scsi">
+ <div id="fence_scsi" class="fencedev">
+ -
+ </div>
+</div>
+
<div metal:define-macro="fence-form-ipmilan">
<div id="fence_ipmilan" class="fencedev">
<table>
@@ -1643,21 +1657,21 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<tr>
<td>IP Address</td>
<td>
<input name="ip_addr" type="text"
- tal:attributes="cur_fendev/ipaddr | nothing" />
+ tal:attributes="value cur_fencedev/ipaddr | nothing" />
</td>
</tr>
<tr>
<td>Login</td>
<td>
<input name="login" type="text"
- tal:attributes="cur_fencedev/login | nothing" />
+ tal:attributes="value cur_fencedev/login | nothing" />
</td>
</tr>
<tr>
@@ -1687,7 +1701,7 @@
<td>Name</td>
<td>
<input name="name" type="text"
- tal:attributes="cur_fencedev/name | nothing" />
+ tal:attributes="value cur_fencedev/name | nothing" />
</td>
</tr>
<input type="hidden" name="fence_type" value="fence_manual" />
@@ -1731,6 +1745,183 @@
<tal:block metal:use-macro="here/form-macros/macros/fence-form-scsi" />
</div>
+<div metal:define-macro="fence-instance-form-apc">
+ <div id="fence_apc_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ <tr>
+ <td>Switch</td>
+ <td>
+ <input name="switch" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-egenera">
+ <div id="fence_egenera_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>lpan</td>
+ <td>
+ <input name="lpan" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ <tr>
+ <td>pserver</td>
+ <td>
+ <input name="pserver" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-wti">
+ <div id="fence_wti_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-brocade">
+ <div id="fence_brocade_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-vixel">
+ <div id="fence_vixel_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-sanbox2">
+ <div id="fence_sanbox2_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-mcdata">
+ <div id="fence_mcdata_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Port</td>
+ <td>
+ <input name="port" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-gndb">
+ <div id="fence_gnbd_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>IP Address</td>
+ <td>
+ <input name="ipaddress" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-bladecenter">
+ <div id="fence_bladecenter_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Blade</td>
+ <td>
+ <input name="ipaddress" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-bullpap">
+ <div id="fence_bullpap_instance" class="fencedev">
+ <table>
+ <tr>
+ <td>Domain</td>
+ <td>
+ <input name="domain" type="text"
+ tal:attributes="value nothing" />
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
+
+<div metal:define-macro="fence-instance-form-list">
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-apc" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-egenera" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-wti" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-brocade" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-vixel" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-sanbox2" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-mcdata" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-gndb" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-bullpap" />
+ <tal:block
+ metal:use-macro="here/form-macros/macros/fence-instance-form-bladecenter" />
+</div>
+
<div metal:define-macro="node-form">
<script type="text/javascript">
set_page_title('Luci — cluster — nodes — properties');
@@ -1749,7 +1940,8 @@
global nodeinfo python: here.getNodeInfo(modelb, nodestatus, 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'));
- global fenceinfo python: here.getFenceInfo(modelb, request)"
+ global fenceinfo python: here.getFenceInfo(modelb, request);
+ global fencedevinfo python: here.getFencesInfo(modelb, request)"
/>
<table class="cluster node" width="100%">
@@ -1891,7 +2083,6 @@
<tal:block metal:use-macro="here/form-macros/macros/fence-form-list" />
</div>
- <h3>Fencing</h3>
<table id="fence_devices" class="cluster node fencedev">
<tfoot class="fencedev">
<tr class="cluster node fencedev"><td class="cluster node fencedev">
@@ -1918,6 +2109,8 @@
<select name="select_div"
onChange="swap_fence_div('fence_container',
this.options[this.selectedIndex].value)">
+ <option value="fence-form-new-device">------ Use an existing Fence Device ------</option>
+ <option value="fence-form-new-instance">------ Create a new Fence Device ------</option>
<tal:block metal:use-macro="here/form-macros/macros/fence-option-list" />
</select>
</form>
@@ -1929,6 +2122,8 @@
<select name="select_div"
onChange="swap_fence_div('fence_container_backup',
this.options[this.selectedIndex].value)">
+ <option value="fence-form-new-device">------ Use an existing Fence Device ------</option>
+ <option value="fence-form-new-instance">------ Create a new Fence Device ------</option>
<tal:block metal:use-macro="here/form-macros/macros/fence-option-list" />
</select>
</form>
--- conga/luci/cluster/index_html 2006/11/07 21:33:52 1.27
+++ conga/luci/cluster/index_html 2006/11/27 19:56:12 1.28
@@ -104,15 +104,16 @@
function swap_fence_div(container_id, element_id) {
var container_element = document.getElementById(container_id)
if (!container_element) {
- alert('Can\'t find element with id = ' + container_id);
return (-1);
}
var child_element = document.getElementById(element_id);
if (!child_element) {
- alert('Can\'t find element with id = ' + element_id);
+ if (container_element.firstChild)
+ container_element.removeChild(container_element.firstChild);
return (-1);
}
+
if (container_element.firstChild)
container_element.removeChild(container_element.firstChild);
var target = child_element.cloneNode(1);
More information about the Cluster-devel
mailing list