From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 12 May 2008 18:03:39 -0000
Subject: [Cluster-devel] conga/luci cluster/resource-form-macros site/l ...
Message-ID: <20080512180339.29254.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-05-12 18:03:39

Modified files:
	luci/cluster   : resource-form-macros 
	luci/site/luci/Extensions: LuciValidation.py ResourceHandler.py 

Log message:
	backported fixes from RHEL5

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.51&r2=1.52
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciValidation.py.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&r1=1.10&r2=1.11

--- conga/luci/cluster/resource-form-macros	2008/04/28 03:56:50	1.51
+++ conga/luci/cluster/resource-form-macros	2008/05/12 18:03:39	1.52
@@ -631,6 +631,19 @@
 		</tr>
 
 		<tr class="systemsTable">
+			<td class="systemsTable">Filesystem type</td>
+			<td class="systemsTable"
+				tal:define="cur_fstype res/attrs/fstype | string:gfs">
+
+				<input type="radio" name="fstype" value="gfs"
+					tal:attributes="checked python:cur_fstype.lower() == 'gfs' and 'checked' or ''" />GFS
+				<br/>
+				<input type="radio" name="fstype" value="gfs2"
+					tal:attributes="checked python:cur_fstype.lower() == 'gfs2' and 'checked' or ''" />GFS2
+			</td>
+		</tr>
+
+		<tr class="systemsTable">
 			<td class="systemsTable">Options</td>
 			<td class="systemsTable">
 				<input type="text" size="20" name="options"
--- conga/luci/site/luci/Extensions/LuciValidation.py	2008/03/05 23:08:58	1.9
+++ conga/luci/site/luci/Extensions/LuciValidation.py	2008/05/12 18:03:39	1.10
@@ -87,7 +87,7 @@
 		fence_method.addAttribute('name', str(method_id))
 		levels[min(1, fence_level - 1)] = fence_method
 	except Exception, e:
-		method_id = fence_level
+		method_id = str(fence_level)
 		fence_method = Method()
 		fence_method.addAttribute('name', str(method_id))
 
--- conga/luci/site/luci/Extensions/ResourceHandler.py	2008/05/12 15:16:04	1.10
+++ conga/luci/site/luci/Extensions/ResourceHandler.py	2008/05/12 18:03:39	1.11
@@ -191,6 +191,19 @@
 			luci_log.debug_verbose('addGfs6: %s' % err)
 
 	try:
+		fstype = form['fstype'].lower().strip()
+		if not fstype:
+			raise KeyError, 'No filesystem type was given'
+		if fstype != 'gfs' and fstype != 'gfs2':
+			raise KeyError, 'An invalid file system type of "%s" was given' % fstype
+		res.addAttribute('fstype', fstype)
+	except Exception, e:
+		err = str(e)
+		errors.append(err)
+		if LUCI_DEBUG_MODE is True:
+			luci_log.debug_verbose('addGfs7a: %s' % err)
+
+	try:
 		options = form['options'].strip()
 		if not options:
 			raise KeyError, 'no options'