Attachment 510963 Details for Bug 705072 – proposed fix

[patch] proposed fix

bz705072.patch (text/plain), 8.68 KB, created by Ryan McCabe on 2011-07-02 04:02:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan McCabe

Created: 2011-07-02 04:02:45 UTC

Size: 8.68 KB

patch

obsolete

>diff -ur a/luci/lib/ClusterConf/FenceDeviceAttr.py b/luci/lib/ClusterConf/FenceDeviceAttr.py
>--- a/luci/lib/ClusterConf/FenceDeviceAttr.py	2011-01-17 00:44:08.000000000 -0500
>+++ b/luci/lib/ClusterConf/FenceDeviceAttr.py	2011-07-01 23:38:54.000000000 -0400
>@@ -35,6 +35,7 @@
> 	'fence_rps10':			'RPS10 Serial Switch',
> 	'fence_lpar':			'LPAR Fencing',
> 	'fence_vmware':			'VMware Fencing',
>+	'fence_vmware_soap':	'VMware Fencing (SOAP Interface)',
> 	'fence_manual':			'Manual Fencing',
> 	'fence_alom':			'Sun ALOM',
> 	'fence_rackswitch':		'RackSaver RackSwitch',
>@@ -69,6 +70,7 @@
> 	'fence_scsi':			True,
> 	'fence_lpar':			True,
> 	'fence_vmware':			True,
>+	'fence_vmware_soap':	True,
> 	'fence_ldom':			True,
> 	'fence_rackswitch':		True,
> 	'fence_cisco_mds':		True,
>diff -ur a/luci/templates/fence_devices.html b/luci/templates/fence_devices.html
>--- a/luci/templates/fence_devices.html	2011-07-01 23:38:41.000000000 -0400
>+++ b/luci/templates/fence_devices.html	2011-07-01 23:38:54.000000000 -0400
>@@ -1119,6 +1119,85 @@
>   <input type="hidden" name="fence_type" value="fence_rhevm" />
> </div>
> 
>+<div py:def="fence_vmware_soap(cur_fencedev, ni)" id="fence_vmware_soap" class="fencedevform row"
>+   py:attrs="cur_fencedev and {'id': 'fd_%s' % cur_fencedev.getName()}">
>+  <table class="formtable">
>+    <tr>
>+      <td>Fence type</td>
>+      <td>VMware (SOAP Interface)</td>
>+    </tr>
>+    <tr>
>+      <td>Name</td>
>+      <td>
>+        <input name="name" type="text" class="text"
>+          py:attrs="cur_fencedev and {'value': cur_fencedev.getName()} or {}"/>
>+      </td>
>+    </tr>
>+    <tr>
>+      <td>IP address or hostname</td>
>+      <td>
>+        <input name="ipaddr" type="text" class="text"
>+          py:attrs="cur_fencedev and {'value': cur_fencedev.getAttribute('ipaddr')} or {}"/>
>+      </td>
>+    </tr>
>+    <tr>
>+      <td>IP port (optional)</td>
>+      <td>
>+        <input name="ipport" type="text" class="text"
>+          py:attrs="cur_fencedev and {'value': cur_fencedev.getAttribute('ipport')} or {}"/>
>+      </td>
>+    </tr>
>+    <tr>
>+      <td>Login</td>
>+      <td>
>+        <input name="login" type="text" class="text"
>+          py:attrs="cur_fencedev and {'value': cur_fencedev.getAttribute('login')} or {}"/>
>+      </td>
>+    </tr>
>+    <tr>
>+      <td>Password</td>
>+      <td>
>+        <input name="passwd" type="password" class="text" autocomplete="off"
>+          py:attrs="cur_fencedev and {'value': cur_fencedev.getAttribute('passwd')} or {}"/>
>+      </td>
>+    </tr>
>+    <tr>
>+      <td>
>+        <span title="Full path to a script to generate fence password">Password Script (optional)</span>
>+      </td>
>+      <td>
>+        <input type="text" class="text" name="passwd_script"
>+          py:attrs="cur_fencedev and {'value': cur_fencedev.getAttribute('passwd_script')} or {}"/>
>+      </td>
>+    </tr>
>+    <tr>
>+      <td>Separator</td>
>+      <td>
>+        <input type="text" class="text" name="separator"
>+          py:attrs="cur_fencedev and {'value': cur_fencedev.getAttribute('separator')} or {}"/>
>+      </td>
>+    </tr>
>+    <tr>
>+      <td>Power wait (seconds)</td>
>+      <td>
>+        <input type="text" class="text" name="power_wait"
>+          py:attrs="cur_fencedev and {'value': cur_fencedev.getAttribute('power_wait')} or {}"/>
>+      </td>
>+    </tr>
>+  </table>
>+
>+  <py:if test="cur_fencedev">
>+    <input type="hidden"
>+      name="orig_name" value="${cur_fencedev.getName()}"/>
>+    <input type="hidden"
>+      name="existing_device" value="1" />
>+  </py:if>
>+
>+  <input type="hidden" name="sharable" value="1" />
>+  <input type="hidden" name="num_instances" value="${ni}"/>
>+  <input type="hidden" name="fence_type" value="fence_vmware_soap" />
>+</div>
>+
> <div py:def="fence_vmware(cur_fencedev, ni)" id="fence_vmware" class="fencedevform row"
>    py:attrs="cur_fencedev and {'id': 'fd_%s' % cur_fencedev.getName()}">
>   <table class="formtable">
>@@ -2940,6 +3019,7 @@
> ${fence_scsi(None,0)}
> ${fence_lpar(None,0)}
> ${fence_vmware(None,0)}
>+${fence_vmware_soap(None,0)}
> ${fence_ilo(None,0)}
> ${fence_drac(None,0)}
> ${fence_rsa(None,0)}
>@@ -3049,7 +3129,7 @@
>       </py:if>
> 
>       <option py:if="cluster_version == 2" name="fence_vixel" value="fence_vixel">Vixel SAN Switch</option>
>-      <option py:if="cluster_version == 2" name="fence_vmware" value="fence_vmware">VMware Fencing (Tech Preview)</option>
>+      <option name="fence_vmware_soap" value="fence_vmware_soap">VMware Fencing (SOAP Interface)</option>
>       <option name="fence_wti" value="fence_wti">WTI Power Switch</option>
> 
>       <py:if test="cluster_version == 3 and cluster_os != 'RHEL'">
>diff -ur a/luci/templates/fence_instances.html b/luci/templates/fence_instances.html
>--- a/luci/templates/fence_instances.html	2011-01-17 00:44:08.000000000 -0500
>+++ b/luci/templates/fence_instances.html	2011-07-01 23:38:54.000000000 -0400
>@@ -173,6 +173,46 @@
>     py:attrs="cur_fence_dev_id and {'value': cur_fence_dev_id} or {}" />
> </div>
> 
>+<div py:def="fence_vmware_soap_instance(cur_fence_inst, cur_fence_dev_id, fi_id, **kw)" id="fence_vmware_soap_instance"
>+  py:attrs="fi_id is not None and {'id': fi_id, 'class':'fenceinst'}">
>+  <table class="detailstable">
>+    <tr>
>+      <td>VM name</td>
>+      <td>
>+        <input name="port" type="text" class="text"
>+          py:attrs="cur_fence_inst and {'value': cur_fence_inst.getAttribute('port')}"/>
>+      </td>
>+    </tr>
>+    <tr>
>+      <td>VM UUID</td>
>+      <td>
>+        <input name="uuid" type="text" class="text"
>+          py:attrs="cur_fence_inst and {'value': cur_fence_inst.getAttribute('uuid')}"/>
>+      </td>
>+    </tr>
>+    <tr>
>+        <td>
>+            <span title="Enable SSL operation">Use SSL</span>
>+        </td>
>+        <td>
>+            <input type="checkbox" class="checkbox" name="ssl"
>+              py:attrs="cur_fence_inst and cur_fence_inst.getAttribute('ssl') and {'checked': 'checked'}"/>
>+        </td>
>+    </tr>
>+    <tr><td colspan="2">
>+      <div>
>+        <input type="button" name="remove_fence" value="Remove this instance"
>+          py:attrs="fi_id is not None and {'onclick': '$(\'#%s\').remove()' % fi_id} or {}"/>
>+      </div>
>+    </td></tr>
>+  </table>
>+
>+  <input type="hidden" name="fence_type" value="fence_vmware_soap" />
>+  <input type="hidden" name="fence_instance" value="1" />
>+  <input type="hidden" name="parent_fencedev"
>+    py:attrs="cur_fence_dev_id and {'value': cur_fence_dev_id} or {}" />
>+</div>
>+
> <div py:def="fence_wti_instance(cur_fence_inst, cur_fence_dev_id, fi_id, **kw)" id="fence_wti_instance"
>   py:attrs="fi_id is not None and {'id': fi_id, 'class':'fenceinst'}">
>   <table class="detailstable">
>@@ -946,6 +986,7 @@
> ${fence_egenera_instance(None, None, None)}
> ${fence_lpar_instance(None, None, None)}
> ${fence_vmware_instance(None, None, None)}
>+${fence_vmware_soap_instance(None, None, None)}
> ${fence_wti_instance(None, None, None)}
> ${fence_brocade_instance(None, None, None)}
> ${fence_vixel_instance(None, None, None)}
>diff -ur a/luci/widget_validators/validate_fence.py b/luci/widget_validators/validate_fence.py
>--- a/luci/widget_validators/validate_fence.py	2011-07-01 23:38:41.000000000 -0400
>+++ b/luci/widget_validators/validate_fence.py	2011-07-01 23:38:54.000000000 -0400
>@@ -221,6 +221,20 @@
> 	errors = config_fence_attr(params, fencedev, fence_name, **kw)
> 	return errors
> 
>+def val_vmware_soap_fd(fencedev, fence_name, **kw):
>+	params = (
>+		('ipaddr', True),
>+ 		('ipport', False),
>+		('login', True),
>+		('passwd', False),
>+		('passwd_script', False),
>+		('separator', False),
>+		('power_wait', False),
>+	)
>+
>+	errors = config_fence_attr(params, fencedev, fence_name, **kw)
>+	return errors
>+
> def val_vmware_fd(fencedev, fence_name, **kw):
> 	params = (
> 		('ipaddr', True),
>@@ -630,6 +644,7 @@
> 	'fence_virt':			val_virt_fd,
> 	'fence_vixel':			val_vixel_fd,
> 	'fence_vmware':			val_vmware_fd,
>+	'fence_vmware_soap':	val_vmware_soap_fd,
> 	'fence_wti':			val_wti_fd,
> 	'fence_xcat':			val_xcat_fd,
> 	'fence_xvm':			val_noop_fd,
>@@ -815,6 +830,18 @@
> 	errors = config_fence_attr(params, fenceinst, parent_name, **kw)
> 	return errors
> 
>+def val_vmware_soap_fi(fenceinst, parent_name, **kw):
>+	params = (
>+		('ssl', False),
>+		('port', False),
>+		('uuid', False),
>+	)
>+
>+	errors = config_fence_attr(params, fenceinst, parent_name, **kw)
>+	if not fenceinst.getAttribute('port') and not fenceinst.getAttribute('uuid'):
>+		errors.append(_('Either a virtual machine name or UUID must be given'))
>+	return errors
>+
> def val_vmware_fi(fenceinst, parent_name, **kw):
> 	params = (
> 		('port', True),
>@@ -955,6 +982,7 @@
> 	'fence_virt':			val_virt_fi,
> 	'fence_vixel':			val_vixel_fi,
> 	'fence_vmware':			val_vmware_fi,
>+	'fence_vmware_soap':	val_vmware_soap_fi,
> 	'fence_wti':			val_wti_fi,
> 	'fence_xcat':			val_noop_fi,
> 	'fence_xvm':			val_xvm_fi,
>Only in b/luci/widget_validators: validate_fence.py.orig

Actions: View | Diff

Attachments on bug 705072: 510963