From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 27 Jul 2007 22:07:55 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions LuciClusterInfo.py
Message-ID: <20070727220755.14331.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: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-07-27 22:07:55

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

Log message:
	Fix bz249868: Use of failover domain not correctly shown

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciClusterInfo.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.5&r2=1.1.4.6

--- conga/luci/site/luci/Extensions/LuciClusterInfo.py	2007/07/26 21:03:42	1.1.4.5
+++ conga/luci/site/luci/Extensions/LuciClusterInfo.py	2007/07/27 22:07:54	1.1.4.6
@@ -528,7 +528,9 @@
 		fdom_map['nodeslist'] = nodelist
 
 		svclist = list()
-		for svc in model.getServices():
+		tmp = model.getServices()
+		tmp.extend(model.getVMs())
+		for svc in tmp:
 			svcname = svc.getName()
 			for sitem in slist:
 				if sitem['name'] == svcname:
@@ -537,7 +539,10 @@
 						svcmap = {}
 						svcmap['name'] = svcname
 						svcmap['status'] = sitem['running']
-						svcmap['svcurl'] = '%s?pagetype=%s&clustername=%s&servicename=%s' % (baseurl, SERVICE, clustername, svcname)
+						if svc.getTagName() == 'vm':
+							svcmap['svcurl'] = '%s?pagetype=%s&clustername=%s&servicename=%s' % (baseurl, VM_CONFIG, clustername, svcname)
+						else:
+							svcmap['svcurl'] = '%s?pagetype=%s&clustername=%s&servicename=%s' % (baseurl, SERVICE, clustername, svcname)
 						svcmap['location'] = sitem['nodename']
 						svclist.append(svcmap)
 		fdom_map['svclist'] = svclist