[Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...

[jparsons at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2006-07-25 00:56:56

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

Log message:
	Fixed null mcast addr error

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.12&r2=1.13

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/07/24 21:51:33	1.12
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/07/25 00:56:56	1.13
@@ -194,9 +194,9 @@
   cldata = {}
   cldata['Title'] = "Cluster List"
   cldata['cfg_type'] = "clusters"
-  cldata['absolute_url'] = url + "?pagetype=" + CLUSTERS
+  cldata['absolute_url'] = url + "?pagetype=" + CLUSTERLIST
   cldata['Description'] = "Clusters available for configuration"
-  if pagetype == CLUSTERS:
+  if pagetype == CLUSTERLIST:
     cldata['currentItem'] = True
   else:
     cldata['currentItem'] = False
@@ -214,16 +214,16 @@
   clcfg = {}
   clcfg['Title'] = "Configure"
   clcfg['cfg_type'] = "clustercfg"
-  clcfg['absolute_url'] = url + "?pagetype=" + CLUSTER_CONFIG
+  clcfg['absolute_url'] = url + "?pagetype=" + CLUSTERS
   clcfg['Description'] = "Configure a cluster"
-  if pagetype == CLUSTER_CONFIG:
+  if pagetype == CLUSTERS:
     clcfg['currentItem'] = True
   else:
     clcfg['currentItem'] = False
 
   #test...
   #clcfg['show_children'] = True
-  if pagetype == CLUSTER_CONFIG or pagetype == CLUSTER:
+  if pagetype == CLUSTERS:
     clcfg['show_children'] = True
   else:
     clcfg['show_children'] = False
@@ -237,7 +237,7 @@
     clsys['absolute_url'] = url + "?pagetype=" + CLUSTER + "&clustername=" + system[0]
     clsys['Description'] = "Configure this cluster"
 
-    if pagetype == CLUSTER:
+    if pagetype == CLUSTER or pagetype == CLUSTER_CONFIG:
       if cname == system[0]:
         clsys['currentItem'] = True
       else:
@@ -688,7 +688,7 @@
 
   ctab = { 'Title':"cluster",
            'Description':"Cluster configuration page", 
-           'Taburl':"../cluster"}
+           'Taburl':"../cluster?pagetype=3"}
   if selectedtab == "cluster":
     ctab['isSelected'] = True
   else:
@@ -965,6 +965,7 @@
     map['is_mcast'] = "True"
   else:
     map['is_mcast'] = "False"
+    map['mcast_addr'] = "1.2.3.4"
     
   #-------------
   #quorum disk params