[Cluster-devel] conga/luci cluster/resource-form-macros site/l ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-02-22 20:52:51

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&r1=1.34&r2=1.35
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.242&r2=1.243
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.57&r2=1.58

--- conga/luci/cluster/resource-form-macros	2007/02/20 23:06:59	1.34
+++ conga/luci/cluster/resource-form-macros	2007/02/22 20:52:50	1.35
@@ -119,17 +119,12 @@
 			<option name="SCR" value="SCR">Script</option>
 			<option name="SMB" value="SMB">Samba</option>
 
-			<tal:block
-				tal:condition="python:clusterinfo and 'has_rgmanager_app_agents' in clusterinfo and clusterinfo['has_rgmanager_app_agents'] is True">
-				<option name="APACHE" value="APACHE">Apache</option>
-				<option name="LVM" value="LVM">LVM</option>
-				<option name="MYSQL" value="MYSQL">MySQL</option>
-				<option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
-				<option name="POSTGRES-8" value="POSTGRES-8">
-					PostgreSQL 8
-				</option>
-				<option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
-			</tal:block>
+			<option name="APACHE" value="APACHE">Apache</option>
+			<option name="LVM" value="LVM">LVM</option>
+			<option name="MYSQL" value="MYSQL">MySQL</option>
+			<option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
+			<option name="POSTGRES-8" value="POSTGRES-8">PostgreSQL 8</option>
+			<option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
 		</select>
 		</form>
 	</p>
@@ -169,17 +164,12 @@
 			<option name="SCR" value="SCR">Script</option>
 			<option name="SMB" value="SMB">Samba</option>
 
-			<tal:block
-				tal:condition="python:clusterinfo and 'has_rgmanager_app_agents' in clusterinfo and clusterinfo['has_rgmanager_app_agents'] is True">
-				<option name="APACHE" value="APACHE">Apache</option>
-				<option name="LVM" value="LVM">LVM</option>
-				<option name="MYSQL" value="MYSQL">MySQL</option>
-				<option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
-				<option name="POSTGRES-8" value="POSTGRES-8">
-					PostgreSQL 8
-				</option>
-				<option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
-			</tal:block>
+			<option name="APACHE" value="APACHE">Apache</option>
+			<option name="LVM" value="LVM">LVM</option>
+			<option name="MYSQL" value="MYSQL">MySQL</option>
+			<option name="OPENLDAP" value="OPENLDAP">Open LDAP</option>
+			<option name="POSTGRES-8" value="POSTGRES-8">PostgreSQL 8</option>
+			<option name="TOMCAT-5" value="TOMCAT-5">Tomcat 5</option>
 		</select>
 		</form>
 	</p>
--- conga/luci/site/luci/Extensions/cluster_adapters.py	2007/02/20 23:07:00	1.242
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2007/02/22 20:52:51	1.243
@@ -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:07:00	1.57
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2007/02/22 20:52:51	1.58
@@ -486,43 +486,6 @@
 	ricci_xml = rc.batch_run(batch_str)
 	return batchAttemptResult(ricci_xml)
 
-def has_rgmanager_app_agents(rc):
-	batch_str = '<module name="rpm"><request API_version="1.0"><function_call name="query"><var mutable="false" name="search" type="list_xml"><rpm name="rgmanager-app-agents"/></var></function_call></request></module>'
-
-	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 = '<module name="cluster"><request API_version="1.0"><function_call name="virt_guest"/></request></module>'