From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 1 Dec 2006 14:56:54 -0000 Subject: [Cluster-devel] conga/luci cluster/fence_device.js cluster/for ... Message-ID: <20061201145654.7922.qmail@sourceware.org> List-Id: 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-12-01 14:56:54 Modified files: luci/cluster : fence_device.js form-macros luci/homebase : luci_homebase.css Log message: more fence device fixes Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence_device.js.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.117&r2=1.118 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/luci_homebase.css.diff?cvsroot=cluster&r1=1.29&r2=1.30 --- conga/luci/cluster/fence_device.js 2006/11/29 18:39:50 1.1 +++ conga/luci/cluster/fence_device.js 2006/12/01 14:56:53 1.2 @@ -1,5 +1,5 @@ function swap_fence_div(container_id, element_id) { - var container_element = document.getElementById(container_id) + var container_element = document.getElementById(container_id); if (!container_element) { return (-1); } @@ -17,3 +17,79 @@ target.id = null; container_element.appendChild(target); } + +function swap_node_fence_div(container_id, fence_opt) { + var container_element = document.getElementById(container_id); + if (!container_element || !fence_opt || !fence_opt.value) + return (-1); + + var fence_id = fence_opt.value; + var child_element = document.getElementById(fence_id); + if (container_element.firstChild) + container_element.removeChild(container_element.firstChild); + + if (!child_element) + return (-1); + + var target = child_element.cloneNode(1); + target.id = null; + + var fence_type = fence_id; + if (fence_opt.className.match(/shared_fencedev/)) { + var input_tags = target.getElementsByTagName('input'); + for (var i = 0 ; i < input_tags.length ; i++) { + if (input_tags[i].type != 'button') { + input_tags[i].disabled = true; + if (input_tags[i].name == 'fence_type') + fence_type = input_tags[i].value; + } + } + } + + var fi_form = document.getElementById(fence_type + '_instance'); + if (fi_form) + target.appendChild(fi_form.cloneNode(1)); + container_element.appendChild(target); +} + +var num_fences_level = Array(0, 0) + +function add_node_fence_device(fence_level) { + var cont_name = 'fence_list_level' + fence_level; + var container = document.getElementById(cont_name); + if (!container) + return (-1); + + var chooser_elem = document.getElementById('fence_selection_block'); + if (!chooser_elem) + return (-1); + + var div_elem = document.createElement('div'); + if (!div_elem) + return (-1); + var level_num_fences = num_fences_level[fence_level]; + + div_elem.id = 'fence' + fence_level + '_' + level_num_fences; + chooser_elem = chooser_elem.cloneNode(1); + chooser_elem.id = null; + chooser_elem.className = null; + + var input_elems = chooser_elem.getElementsByTagName('input'); + if (!input_elems || input_elems.length < 2) + return (-1); + for (var i = 0 ; i < input_elems.length ; i++) { + if (input_elems[i].name == 'fence_level') + input_elems[i].value = fence_level; + else if (input_elems[i].name == 'fence_num') + input_elems[i].value = level_num_fences++; + } + + var select_elem = chooser_elem.getElementsByTagName('select'); + if (!select_elem || select_elem.length != 1) + return (-1); + select_elem[0].setAttribute('onChange', "swap_node_fence_div('" + div_elem.id + "', this.options[this.selectedIndex])"); + + div_elem.appendChild(chooser_elem); + container.appendChild(div_elem); + num_fences_level[fence_level]++; +} --- conga/luci/cluster/form-macros 2006/11/30 22:31:22 1.117 +++ conga/luci/cluster/form-macros 2006/12/01 14:56:53 1.118 @@ -1141,7 +1141,7 @@
- + @@ -1183,7 +1183,7 @@
Fence Type APC Power Switch
- + @@ -1225,7 +1225,7 @@
Fence Type McData SAN Switch
- + @@ -1260,7 +1260,7 @@
Fence Type WTI Power Switch
- + @@ -1302,7 +1302,7 @@
Fence Type HP iLO
- + @@ -1343,7 +1343,7 @@
Fence Type Dell Drac
- + @@ -1385,7 +1385,7 @@
Fence Type IBM RSA II
- + @@ -1427,7 +1427,7 @@
Fence Type Brocade Fabric Switch
- + @@ -1466,7 +1466,7 @@
Fence Type QLogic SANbox2
- + @@ -1501,7 +1501,7 @@
Fence Type Vixel SAN Switch
- + @@ -1529,7 +1529,7 @@
Fence Type GNBD
- + @@ -1564,7 +1564,7 @@
Fence Type Egenera SAN Controller
- + @@ -1606,7 +1606,7 @@
Fence Type IBM Blade Center
- + @@ -1648,7 +1648,7 @@
Fence Type Bull PAP
- + @@ -1683,7 +1683,7 @@
Fence Type RPS10 Serial Switch
- + @@ -1703,7 +1703,7 @@
Fence Type Virtual Machine Fencing
- + @@ -1723,7 +1723,7 @@
Fence Type SCSI Reservation Fencing
- + @@ -1769,7 +1769,7 @@
Fence Type IPMI Lan
- + @@ -1863,7 +1863,7 @@
-
+
Fence Type Manual Fencing
@@ -1884,7 +1884,7 @@
-
+
Port
@@ -1905,7 +1905,7 @@
-
+
lpan
@@ -1919,7 +1919,7 @@
-
+
Port
@@ -1933,7 +1933,7 @@
-
+
Port
@@ -1947,7 +1947,7 @@
-
+
Port
@@ -1961,7 +1961,7 @@
-
+
Port
@@ -1975,7 +1975,7 @@
-
+
Port
@@ -1989,7 +1989,7 @@
-
+
IP Address
@@ -2003,7 +2003,7 @@
-
+
Blade
@@ -2017,7 +2017,7 @@
-
+
Domain
@@ -2214,79 +2214,91 @@
-
Domain
- - + + + + + + +
- -
+ + - - - + + - - + - + + + +
+ +
+
+ +
- + +
+ Main Fencing Method - + Backup Fencing Method
- - - +
+
+ + XXX - fill in any existing fence devices for this node + and update the counter number for this level + +
-
- -
-
+
+
-
-
- -
-
+
+
+ + XXX - fill in any existing fence devices for this node + and update the counter number for this level +
-
-
@@ -3051,23 +3063,23 @@
- - -
+ + + - - - + + - - +
- +
+ Fencing Type
+
--- conga/luci/homebase/luci_homebase.css 2006/11/03 21:47:27 1.29 +++ conga/luci/homebase/luci_homebase.css 2006/12/01 14:56:54 1.30 @@ -14,27 +14,27 @@ background: #dee7ec; } -div.fencedev { +div.fence { max-width: 700px; padding: .5em; } -*.fencedev { +*.fence { background: #dee7ec; } -table.fencedev { +table.fence { padding: .618em; width: 700px; } -div.fencedev, -td.fencedev { +div.fence, +td.fence { padding-top: .309em; padding-bottom: .309em; } -td.fencedev { +td.fence { width: 50%; } @@ -438,6 +438,21 @@ margin-bottom: .25em ! important; } +div.fence_add { + margin-top: .25em ! important; + margin-bottom: .25em ! important; +} + +div.fence_container { + border: thin solid #c9c9c9; +} + +div.fence_control { + margin-top: 2em; + margin-bottom: .75em; + margin-left: .33em; +} + div.service_comp_list { background: #dee7ec; max-width: 700px;