From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 1 Mar 2007 00:40:53 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions ricci_bridge.py
Message-ID: <20070301004053.5852.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
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-03-01 00:40:53

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

Log message:
	Revert services patch from HEAD

Patches:
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.3&r2=1.56.2.4

--- conga/luci/site/luci/Extensions/ricci_bridge.py	2007/03/01 00:39:18	1.56.2.3
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2007/03/01 00:40:53	1.56.2.4
@@ -486,85 +486,6 @@
 	ricci_xml = rc.batch_run(batch_str)
 	return batchAttemptResult(ricci_xml)
 
-def svc_manage(rc, hostname, servicename, op):
-	svc_func = None
-
-	doc = minidom.Document()
-	elem = doc.createElement('result')
-	elem.setAttribute('success', '0')
-
-	if not servicename:
-		elem.setAttribute('service', 'No service name was specified.')
-		elem.setAttribute('message', 'No service name was specified.')
-
-	if not op:
-		elem.setAttribute('operation', 'No operation was specified.')
-		elem.setAttribute('message', 'No operation was specified.')
-
-	if not servicename or not op:
-		doc.appendChild(elem)
-		return doc
-
-	elem.setAttribute('service', servicename)
-	elem.setAttribute('operation', op)
-	elem.setAttribute('hostname', hostname)
-
-	try:
-		op = op.strip().lower()
-		if op == 'restart' or op == 'start' or op == 'stop':
-			svc_func = op
-		else:
-			raise Exception, op
-	except Exception, e:
-		elem.setAttribute('message', 'Unknown operation: %s' % str(e))
-		doc.appendChild(elem)
-		return doc
-
-	batch_str = '<module name="service"><request API_version="1.0"><function_call name="%s"><var mutable="false" name="services" type="list_xml"><service name="%s"/></var></function_call></request></module>' % (svc_func, servicename)
-		
-	ricci_xml = rc.batch_run(batch_str, async=False)
-	if not ricci_xml or not ricci_xml.firstChild:
-		elem.setAttribute('message', 'operation failed')
-		doc.appendChild(elem)
-		return doc
-
-	try:
-		mod_elem = ricci_xml.getElementsByTagName('module')
-		status_code = int(mod_elem[0].getAttribute('status'))
-		if status_code == 0:
-			var_elem = mod_elem[0].getElementsByTagName('var')
-			for i in var_elem:
-				name = i.getAttribute('name').lower()
-				if name == 'success':
-					success = i.getAttribute('value').lower()
-					if success == 'true':
-						elem.setAttribute('success', '1')
-						elem.setAttribute('message', 'success')
-					else:
-						elem.setAttribute('message', 'operation failed')
-					break
-		else:
-			err_msg = mod_elem[0].childNodes[1].getAttribute('description')
-			elem.setAttribute('message', err_msg)
-	except Exception, e:
-		elem.setAttribute('message', 'operation failed')
-
-	doc.appendChild(elem)
-	return doc
-
-def list_services(rc):
-	batch_str = '<module name="service"><request API_version="1.0"><function_call name="list"><var mutable="false" name="description" type="boolean" value="true"/></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('LS0: None returned')
-		return None
-	try:
-		service_tags = ricci_xml.getElementsByTagName('service')
-		return service_tags
-	except Exception, e:
-		luci_log.debug_verbose('LS1: %s' % str(e))
-	return None
-
 def nodeIsVirtual(rc):
 	batch_str = '<module name="cluster"><request API_version="1.0"><function_call name="virt_guest"/></request></module>'