From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 14 Jun 2007 19:30:45 -0000 Subject: [Cluster-devel] conga/luci cluster/resource-form-macros cluste ... Message-ID: <20070614193045.24221.qmail@sourceware.org> List-Id: 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 Branch: EXPERIMENTAL Changes by: rmccabe at sourceware.org 2007-06-14 19:30:44 Modified files: luci/cluster : resource-form-macros resource_form_handlers.js luci/site/luci/Extensions: LuciClusterActions.py RicciQueries.py cluster_adapters.py conga_constants.py Log message: Resolve bz239596 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.37.2.3&r2=1.37.2.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.34.2.1&r2=1.34.2.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterActions.py.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.1.2.7&r2=1.1.2.8 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/RicciQueries.py.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.1.2.8&r2=1.1.2.9 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.255.2.15&r2=1.255.2.16 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/conga_constants.py.diff?cvsroot=cluster&only_with_tag=EXPERIMENTAL&r1=1.39.2.9&r2=1.39.2.10 --- conga/luci/cluster/resource-form-macros 2007/06/07 06:41:05 1.37.2.3 +++ conga/luci/cluster/resource-form-macros 2007/06/14 19:30:44 1.37.2.4 @@ -125,6 +125,8 @@ + +

@@ -172,6 +174,8 @@ + +

@@ -1176,10 +1180,219 @@
+

SAP Instance Configuration

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SAP Instance Name + +
+ SAP executable directory + + +
+ Directory containing the SAP START profile + + +
Name of the SAP START profile + +
+
+
+

SAP Database Configuration

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SAP Database Name + +
+ SAP executable directory + + +
Database type + +
Oracle TNS listener name + +
ABAP stack is not installed, only Java stack is installed + +
+ J2EE instance bootstrap directory + + +
+ J2EE security store path + + +
+
+
%d' \ + % creation_status) except Exception, e: if LUCI_DEBUG_MODE is True: - luci_log.debug_verbose('ICB16: last_status err: %s %d: %r %s' % (item[0], creation_status, e, str(e))) + luci_log.debug_verbose('ICB23: last_status err: %s %d: %r %s' % (item[0], creation_status, e, str(e))) continue else: node_report = {} @@ -3072,7 +3092,7 @@ err_msg = '' if LUCI_DEBUG_MODE is True: - luci_log.debug_verbose('ICB15: ricci error: %s: %r %s' \ + luci_log.debug_verbose('ICB24: ricci error: %s: %r %s' \ % (ricci[0], e, str(e))) if rc is not None: @@ -3097,7 +3117,7 @@ clusterfolder.manage_delObjects([item[0]]) except Exception, e: if LUCI_DEBUG_MODE is True: - luci_log.info('ICB16: Unable to delete %s: %r %s' \ + luci_log.info('ICB25: Unable to delete %s: %r %s' \ % (item[0], e, str(e))) busy_map['busy'] = None else: @@ -3116,14 +3136,18 @@ part2 = dex except: pass - busy_map['refreshurl'] = '3; url=%s?%s' % (part1, part2) + busy_map['refreshurl'] = '%d; url=%s?%s' % (REDIRECT_SEC, part1, part2) req['specialpagetype'] = '1' else: try: query = req['QUERY_STRING'].replace('&busyfirst=true', '') - busy_map['refreshurl'] = '3; url=%s?%s' % (req['ACTUAL_URL'], query) + busy_map['refreshurl'] = '%d; url=%s?%s' \ + % (REDIRECT_SEC, req['ACTUAL_URL'], query) except: - busy_map['refreshurl'] = '3; url=/luci/cluster?pagetype=3' + busy_map['refreshurl'] = '%d; url=/luci/cluster?pagetype=3' \ + % REDIRECT_SEC + if LUCI_DEBUG_MODE is True: + luci_log.debug_verbose('ICB26: returning busy_map: %s' % str(busy_map)) return busy_map # These are called from external methods. --- conga/luci/site/luci/Extensions/conga_constants.py 2007/06/08 18:26:14 1.39.2.9 +++ conga/luci/site/luci/Extensions/conga_constants.py 2007/06/14 19:30:44 1.39.2.10 @@ -133,6 +133,8 @@ 'A problem occurred when starting this node: %s' ] +REDIRECT_SEC = 3 + # cluster/node create error status messages PRE_INSTALL = 'The install state is not yet complete.' PRE_REBOOT = 'Installation complete, but reboot not yet complete.' @@ -141,7 +143,8 @@ POSSIBLE_REBOOT_MESSAGE = 'This node is not currently responding and is probably rebooting as planned. This state could persist for 5 minutes or so...' -REDIRECT_MSG = ' -- You will be redirected in 5 seconds.' +REDIRECT_MSG = ' -- You will be redirected in %d seconds.' % REDIRECT_SEC + # Debugging parameters. Set LUCI_DEBUG_MODE to True and LUCI_DEBUG_VERBOSITY # to >= 2 to get full debugging output in syslog (LOG_DAEMON/LOG_DEBUG).