[Cluster-devel] conga/luci/site/luci/Extensions ResourceHandler.py
rmccabe at sourceware.org
rmccabe at sourceware.org
Tue May 22 17:12:29 UTC 2007
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' ]:
More information about the Cluster-devel
mailing list