[Cluster-devel] conga/luci/site/luci/Extensions ResourceHandler.py

[Cluster-devel] conga/luci/site/luci/Extensions ResourceHandler.py

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-04-29 16:10:39

Modified files:
	luci/site/luci/Extensions: ResourceHandler.py 

Log message:
	Another nfs resource agent fix attribute name fix related to bz444195

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.4&r2=1.1.4.5

--- conga/luci/site/luci/Extensions/ResourceHandler.py	2008/04/28 03:54:18	1.1.4.4
+++ conga/luci/site/luci/Extensions/ResourceHandler.py	2008/04/29 16:10:39	1.1.4.5
@@ -286,7 +286,7 @@
 		if nfstype != 'nfs' and nfstype != 'nfs4':
 			raise Exception, 'An invalid NFS version "%s" was given for "%s"' \
 								% (nfstype, rname)
-		res.addAttribute('nfstype', nfstype)
+		res.addAttribute('fstype', nfstype)
 	except Exception, e:
 		err = str(e)
 		errors.append(err)

[Cluster-devel] conga/luci/site/luci/Extensions ResourceHandler.py

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-04-29 16:09:29

Modified files:
	luci/site/luci/Extensions: ResourceHandler.py 

Log message:
	Another netfs resource agent fix attribute name fix related to bz444195

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2.2.4&r2=1.2.2.5

--- conga/luci/site/luci/Extensions/ResourceHandler.py	2008/04/28 03:54:57	1.2.2.4
+++ conga/luci/site/luci/Extensions/ResourceHandler.py	2008/04/29 16:09:26	1.2.2.5
@@ -286,7 +286,7 @@
 		if nfstype != 'nfs' and nfstype != 'nfs4':
 			raise Exception, 'An invalid NFS version "%s" was given for "%s"' \
 								% (nfstype, rname)
-		res.addAttribute('nfstype', nfstype)
+		res.addAttribute('fstype', nfstype)
 	except Exception, e:
 		err = str(e)
 		errors.append(err)

[Cluster-devel] conga/luci/site/luci/Extensions ResourceHandler.py

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-04-28 03:54:57

Modified files:
	luci/site/luci/Extensions: ResourceHandler.py 

Log message:
	Fix typo in last commit to this branch

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2.2.3&r2=1.2.2.4

--- conga/luci/site/luci/Extensions/ResourceHandler.py	2008/04/28 03:49:07	1.2.2.3
+++ conga/luci/site/luci/Extensions/ResourceHandler.py	2008/04/28 03:54:57	1.2.2.4
@@ -271,7 +271,7 @@
 			luci_log.debug_verbose('addNfsm7: %s' % err)
 
 	try:
-		exportpath = form['export'].strip()
+		exportpath = form['exportpath'].strip()
 		if not exportpath:
 			raise Exception, 'No export path was given for "%s"' % rname
 		res.addAttribute('export', exportpath)

[Cluster-devel] conga/luci/site/luci/Extensions ResourceHandler.py

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-09-18 21:49:46

Modified files:
	luci/site/luci/Extensions: ResourceHandler.py 

Log message:
	add support for setting the self_fence attribute on clusterfs resources, part 2

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&r1=1.2&r2=1.3

--- conga/luci/site/luci/Extensions/ResourceHandler.py	2007/06/25 16:03:38	1.2
+++ conga/luci/site/luci/Extensions/ResourceHandler.py	2007/09/18 21:49:46	1.3
@@ -218,6 +218,11 @@
 	else:
 		res.addAttribute('force_unmount', '0')
 
+	if form.has_key('selffence'):
+		res.addAttribute('self_fence', '1')
+	else:
+		res.addAttribute('self_fence', '0')
+
 	return errors
 
 def addNetfs(res, rname, form, model):

[Cluster-devel] conga/luci/site/luci/Extensions ResourceHandler.py

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	EXPERIMENTAL
Changes by:	rmccabe at sourceware.org	2007-05-22 17:12:25

Modified files:
	luci/site/luci/Extensions: ResourceHandler.py 

Log message:
	The primary keys for SAPDatabase and SAPInstance are 'SID' and 'SAPInstance', respectively, not 'name'.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.1.2.4&r2=1.1.2.5

--- conga/luci/site/luci/Extensions/Attic/ResourceHandler.py	2007/05/22 02:45:54	1.1.2.4
+++ conga/luci/site/luci/Extensions/Attic/ResourceHandler.py	2007/05/22 17:12:25	1.1.2.5
@@ -674,16 +674,8 @@
 def addSAPDatabase(res, rname, form, model):
 	errors = list()
 
-	try:
-		sid = form['SID'].strip()
-		if not sid:
-			raise KeyError, 'No SAP system identifier was given.'
-		res.addAttribute('SID', sid)
-	except Exception, e:
-		err = str(e)
-		errors.append(err)
-		if LUCI_DEBUG_MODE is True:
-			luci_log.debug_verbose('addSAPD0: %s' % err)
+	res.removeAttribute('name')
+	res.addAttribute('SID', rname)
 
 	try:
 		dbtype = form['DBTYPE'].strip()
@@ -720,16 +712,8 @@
 def addSAPInstance(res, rname, form, model):
 	errors = list()
 
-	try:
-		iname = form['InstanceName'].strip()
-		if not iname:
-			raise KeyError, 'No SAP instance name was given.'
-		res.addAttribute('InstanceName', iname)
-	except Exception, e:
-		err = str(e)
-		errors.append(err)
-		if LUCI_DEBUG_MODE is True:
-			luci_log.debug_verbose('addSAPI0: %s' % err)
+	res.removeAttribute('name')
+	res.addAttribute('InstanceName', rname)
 
 	# Optional string parameters
 	for param in [ 'DIR_EXECUTABLE', 'DIR_PROFILE', 'START_PROFILE' ]: