[Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
jparsons at sourceware.org
jparsons at sourceware.org
Sat Aug 12 21:13:55 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: jparsons at sourceware.org 2006-08-12 22:13:55
Modified files:
luci/site/luci/Extensions: cluster_adapters.py
Log message:
Various flaw fixes
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.43&r2=1.44
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2006/08/12 20:31:18 1.43
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2006/08/12 21:13:55 1.44
@@ -1319,7 +1319,7 @@
clustername = request['clustername']
nodename = request['nodename']
task = request['task']
- nodename_resolved = resolve_nodename(clustername, nodename)
+ nodename_resolved = resolve_nodename(self, clustername, nodename)
if nodename_resolved == None:
return None
@@ -1339,9 +1339,9 @@
flag.manage_addProperty(TASKTYPE,NODE_LEAVE_CLUSTER, "string")
flag.manage_addProperty(FLAG_DESC,"Node \'" + nodename + "\' leaving cluster", "string")
- response = req.RESPONSE
+ response = request.RESPONSE
#Is this correct? Should we re-direct to the cluster page?
- response.redirect(req['URL'] + "?pagetype=" + CLUSTER_CONFIG)
+ response.redirect(request['URL'] + "?pagetype=" + CLUSTER_CONFIG + "&clustername=" + clustername)
elif task == NODE_JOIN_CLUSTER:
rb = ricci_bridge(nodename_resolved)
@@ -1359,9 +1359,9 @@
flag.manage_addProperty(TASKTYPE,NODE_JOIN_CLUSTER, "string")
flag.manage_addProperty(FLAG_DESC,"Node \'" + nodename + "\' joining cluster", "string")
- response = req.RESPONSE
+ response = request.RESPONSE
#Once again, is this correct? Should we re-direct to the cluster page?
- response.redirect(req['URL'] + "?pagetype=" + CLUSTER_CONFIG)
+ response.redirect(request['URL'] + "?pagetype=" + CLUSTER_CONFIG + "&clustername=" + clustername)
elif task == NODE_REBOOT:
@@ -1380,9 +1380,9 @@
flag.manage_addProperty(TASKTYPE,NODE_REBOOT, "string")
flag.manage_addProperty(FLAG_DESC,"Node \'" + nodename + "\' is being rebooted", "string")
- response = req.RESPONSE
+ response = request.RESPONSE
#Once again, is this correct? Should we re-direct to the cluster page?
- response.redirect(req['URL'] + "?pagetype=" + CLUSTER_CONFIG)
+ response.redirect(request['URL'] + "?pagetype=" + CLUSTER_CONFIG + "&clustername=" + clustername)
elif task == NODE_FENCE:
@@ -1418,9 +1418,9 @@
flag.manage_addProperty(TASKTYPE,NODE_FENCE, "string")
flag.manage_addProperty(FLAG_DESC,"Node \'" + nodename + "\' is being fenced", "string")
- response = req.RESPONSE
+ response = request.RESPONSE
#Once again, is this correct? Should we re-direct to the cluster page?
- response.redirect(req['URL'] + "?pagetype=" + CLUSTER_CONFIG)
+ response.redirect(request['URL'] + "?pagetype=" + CLUSTER_CONFIG + "&clustername=" + clustername)
elif task == NODE_DELETE:
More information about the Cluster-devel
mailing list