From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 13 Aug 2006 13:48:38 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
Message-ID: <20060813134838.25715.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
Changes by:	jparsons at sourceware.org	2006-08-13 14:48:37

Modified files:
	luci/site/luci/Extensions: cluster_adapters.py 
	                           conga_constants.py 

Log message:
	Better node info look

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.44&r2=1.45
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/conga_constants.py.diff?cvsroot=cluster&r1=1.7&r2=1.8

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/08/12 21:13:55	1.44
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/08/13 13:48:36	1.45
@@ -1560,10 +1560,15 @@
     cfgurl = baseurl + "?" + PAGETYPE + "=" + NODE_CONFIG + "&" + CLUNAME + "=" + clustername + "&nodename=" + name
     map['configurl'] = cfgurl
     map['fenceurl'] = cfgurl + "#fence"
-    if item['online'] == "true":
-      map['status'] = "online"
+    if item['clustered'] == "true":
+      map['status'] = NODE_ACTIVE
+      map['status_str'] = NODE_ACTIVE_STR
+    elif item['online'] == "false":
+      map['status'] = NODE_UNKNOWN
+      map['status_str'] = NODE_UNKNOWN_STR
     else:
-      map['status'] = "offline"
+      map['status'] = NODE_INACTIVE
+      map['status_str'] = NODE_INACTIVE_STR
     #figure out current services running on this node
     svc_dict_list = list()
     for svc in svclist:
--- conga/luci/site/luci/Extensions/conga_constants.py	2006/08/02 17:25:54	1.7
+++ conga/luci/site/luci/Extensions/conga_constants.py	2006/08/13 13:48:36	1.8
@@ -65,3 +65,6 @@
 NODE_ACTIVE="0"
 NODE_INACTIVE="1"
 NODE_UNKNOWN="2"
+NODE_ACTIVE_STR="Cluster Member"
+NODE_INACTIVE_ST="Not a Cluster Member"
+NODE_UNKNOWN_STR="Unknown State"