From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 22 Feb 2007 20:52:07 -0000 Subject: [Cluster-devel] conga/luci cluster/resource-form-macros site/l ... Message-ID: <20070222205207.28607.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: RHEL4 Changes by: rmccabe at sourceware.org 2007-02-22 20:52:07 Modified files: luci/cluster : resource-form-macros luci/site/luci/Extensions: cluster_adapters.py ricci_bridge.py Log message: - Remove the check for the rgmanager-app-agents package for the application resources Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.31.2.3&r2=1.31.2.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.227.2.10&r2=1.227.2.11 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.56.2.1&r2=1.56.2.2 --- conga/luci/cluster/resource-form-macros 2007/02/20 23:09:37 1.31.2.3 +++ conga/luci/cluster/resource-form-macros 2007/02/22 20:52:06 1.31.2.4 @@ -119,17 +119,12 @@ - - - - - - - - + + + + + +

@@ -169,17 +164,12 @@ - - - - - - - - + + + + + +

--- conga/luci/site/luci/Extensions/cluster_adapters.py 2007/02/20 23:09:37 1.227.2.10 +++ conga/luci/site/luci/Extensions/cluster_adapters.py 2007/02/22 20:52:07 1.227.2.11 @@ -3895,18 +3895,7 @@ luci_log.debug_verbose('GCI0: unable to determine cluster name') return {} - has_app_agents = False - try: - ricci = req.SESSION.get('ricci') - if not ricci: - raise Exception, 'blank' - has_app_agents = has_rgmanager_app_agents(ricci) - except Exception, e: - luci_log.debug_verbose('GCI0a: %s' % str(e)) - has_app_agents = False - clumap = {} - clumap['has_rgmanager_app_agents'] = has_app_agents if model is None: try: model = getModelForCluster(self, cluname) --- conga/luci/site/luci/Extensions/ricci_bridge.py 2007/02/20 23:09:37 1.56.2.1 +++ conga/luci/site/luci/Extensions/ricci_bridge.py 2007/02/22 20:52:07 1.56.2.2 @@ -486,43 +486,6 @@ ricci_xml = rc.batch_run(batch_str) return batchAttemptResult(ricci_xml) -def has_rgmanager_app_agents(rc): - batch_str = '' - - ricci_xml = rc.batch_run(batch_str, async=False) - if not ricci_xml or not ricci_xml.firstChild: - luci_log.debug_verbose('HRAA0: None returned') - return None - - rpm_tags = ricci_xml.getElementsByTagName('rpm') - if not rpm_tags or len(rpm_tags) < 1: - luci_log.debug_verbose('HRAA: unexpected response %s' \ - % ricci_xml.toxml()) - return None - - has_agents = False - for i in rpm_tags: - try: - name = i.getAttribute('name') - if not name: - raise Exception, 'blank' - except Exception, e: - luci_log.debug_verbose('HRAA2: %s' % str(e)) - continue - - if name.strip().lower() != 'rgmanager-app-agents': - continue - - try: - version = i.getAttribute('version').strip() - if version: - has_agents = True - except Exception, e: - luci_log.debug_verbose('HRAA3: %s' % str(e)) - break - - return has_agents - def nodeIsVirtual(rc): batch_str = ''