From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 17 Jan 2008 16:36:32 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions LuciValidation ...
Message-ID: <20080117163632.18236.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:	rmccabe at sourceware.org	2008-01-17 16:36:31

Modified files:
	luci/site/luci/Extensions: LuciValidation.py FenceHandler.py 
	luci/site/luci/Extensions/ClusterModel: FenceDeviceAttr.py 

Log message:
	fix 238655

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciValidation.py.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.29&r2=1.30
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ClusterModel/FenceDeviceAttr.py.diff?cvsroot=cluster&r1=1.4&r2=1.5

--- conga/luci/site/luci/Extensions/LuciValidation.py	2008/01/15 04:41:40	1.3
+++ conga/luci/site/luci/Extensions/LuciValidation.py	2008/01/17 16:36:30	1.4
@@ -217,7 +217,7 @@
 
 					# Add back the tags under the method block
 					# for the fence instance
-					if type == 'fence_manual':
+					if fence_type == 'fence_manual':
 						instance_list.append({'name': fencedev_name, 'nodename': nodename })
 					else:
 						instance_list.append({'name': fencedev_name })
@@ -234,7 +234,7 @@
 			# so the appropriate XML goes into the <method> block inside
 			# <node><fence>. All we need for that is the device name.
 			if not fence_form.has_key('sharable'):
-				if type == 'fence_manual':
+				if fence_type == 'fence_manual':
 					instance_list.append({'name': fencedev_name, 'nodename': nodename })
 				else:
 					instance_list.append({'name': fencedev_name })
--- conga/luci/site/luci/Extensions/FenceHandler.py	2008/01/02 21:00:31	1.29
+++ conga/luci/site/luci/Extensions/FenceHandler.py	2008/01/17 16:36:30	1.30
@@ -1055,6 +1055,12 @@
 
 	return errors
 
+def val_manual_fi(form, fenceinst):
+	nodename = form.get('nodename')
+	if nodename:
+		fenceinst.addAttribute('nodename', nodename)
+	return []
+
 def val_noop_fi(dummy, _dummy):
 	return []
 
@@ -1069,14 +1075,14 @@
 	'fence_mcdata':			val_mcdata_fi,
 	'fence_egenera':		val_egenera_fi,
 	'fence_bullpap':		val_bullpap_fi,
+	'fence_manual':			val_manual_fi,
 	'fence_xvm':			val_xvm_fi,
 	'fence_scsi':			val_scsi_fi,
 	'fence_ilo':			val_noop_fi,
 	'fence_ipmilan':		val_noop_fi,
 	'fence_drac':			val_noop_fi,
 	'fence_rsa':			val_noop_fi,
-	'fence_rps10':			val_noop_fi,
-	'fence_manual':			val_noop_fi
+	'fence_rps10':			val_noop_fi
 }
 
 def validate_fenceinstance(form, parent_name, fence_agent):
--- conga/luci/site/luci/Extensions/ClusterModel/FenceDeviceAttr.py	2008/01/02 20:56:08	1.4
+++ conga/luci/site/luci/Extensions/ClusterModel/FenceDeviceAttr.py	2008/01/17 16:36:30	1.5
@@ -130,5 +130,5 @@
 	'fence_rps10':
 		( 'name', 'device', 'port' ),
 	'fence_manual':
-		( 'name' )
+		( 'name', 'nodename' )
 }