From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci/site/luci/Extensions LuciClusterInfo.py
Date: 27 Jul 2007 22:07:55 -0000 [thread overview]
Message-ID: <20070727220755.14331.qmail@sourceware.org> (raw)
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
next reply other threads:[~2007-07-27 22:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-27 22:07 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-07-26 21:03 [Cluster-devel] conga/luci/site/luci/Extensions LuciClusterInfo.py rmccabe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070727220755.14331.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).