From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 11 Jan 2007 22:49:43 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions FenceHandler.p ...
Message-ID: <20070111224943.9176.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:	rmccabe at sourceware.org	2007-01-11 22:49:42

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

Log message:
	fix fence add and fence edit

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.202&r2=1.203
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/conga_constants.py.diff?cvsroot=cluster&r1=1.33&r2=1.34

--- conga/luci/site/luci/Extensions/FenceHandler.py	2006/12/21 03:41:43	1.11
+++ conga/luci/site/luci/Extensions/FenceHandler.py	2007/01/11 22:49:42	1.12
@@ -1058,7 +1058,7 @@
 
   if agent_type == "fence_apc":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1066,7 +1066,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1082,11 +1082,11 @@
 
   elif agent_type == "fence_wti":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1101,7 +1101,7 @@
 
   elif agent_type == "fence_brocade":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1109,7 +1109,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1125,11 +1125,11 @@
 
   elif agent_type == "fence_vixel":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1145,7 +1145,7 @@
 
   elif agent_type == "fence_mcdata":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1153,7 +1153,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1199,7 +1199,7 @@
 
   elif agent_type == "fence_sanbox2":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1207,7 +1207,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1223,7 +1223,7 @@
 
   elif agent_type == "fence_bladecenter":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1231,7 +1231,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1247,7 +1247,7 @@
 
   elif agent_type == "fence_bullpap":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1255,7 +1255,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1295,6 +1295,7 @@
 def validateFenceDevice(form, model): 
   from FenceDevice import FenceDevice
   namechange = False
+
   try:
     agent_type = form['fence_type']
   except KeyError, e:
@@ -1309,7 +1310,7 @@
     return (FD_VAL_FAIL, "No device name in form submission")
 
   if fencedev_name == "":
-    return (1, "A unique name is required for every fence device")
+    return (1, "No device name in form submission")
 
   try:
     orig_name = form['orig_name']
@@ -1319,10 +1320,12 @@
   if orig_name != fencedev_name:
     namechange = True
 
-  fencedevs = model.getFenceDevices()
-  for fd in fencedevs:
-    if fd.getName().strip() == fencedev_name:
-      return (FD_VAL_FAIL, FD_PROVIDE_NAME)
+    fencedevs = model.getFenceDevices()
+    for fd in fencedevs:
+      if fd.getName().strip() == fencedev_name:
+        return (FD_VAL_FAIL, FD_PROVIDE_NAME)
+  else:
+    fencedevs = model.getFenceDevices()
 
   #Now we know name is unique...find device now
   fencedev = None
@@ -1336,7 +1339,7 @@
 
   if agent_type == "fence_apc":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1344,7 +1347,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1359,11 +1362,11 @@
 
   elif agent_type == "fence_wti":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1377,7 +1380,7 @@
 
   elif agent_type == "fence_brocade":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1385,7 +1388,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1400,11 +1403,11 @@
 
   elif agent_type == "fence_vixel":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1419,7 +1422,7 @@
 
   elif agent_type == "fence_mcdata":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1427,7 +1430,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1470,7 +1473,7 @@
 
   elif agent_type == "fence_sanbox2":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1478,7 +1481,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1493,7 +1496,7 @@
 
   elif agent_type == "fence_bladecenter":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1501,7 +1504,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
@@ -1516,7 +1519,7 @@
 
   elif agent_type == "fence_bullpap":
     try:
-      ip = form['ip_addr']
+      ip = form['ipaddr']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_IP)
     try:
@@ -1524,7 +1527,7 @@
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_LOGIN)
     try:
-      pwd = form['password']
+      pwd = form['passwd']
     except KeyError, e:
       return (FD_VAL_FAIL, FD_PROVIDE_PASSWD)
 
--- conga/luci/site/luci/Extensions/cluster_adapters.py	2007/01/11 19:11:04	1.202
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2007/01/11 22:49:42	1.203
@@ -1979,7 +1979,7 @@
 	31: validateResourceAdd,
 	33: validateResourceAdd,
 	51: validateFenceAdd,
-	50: validateFenceEdit,
+	54: validateFenceEdit,
 	55: validateDaemonProperties,
 	57: deleteFenceDevice,
 	58: validateNodeFenceConfig
--- conga/luci/site/luci/Extensions/conga_constants.py	2007/01/05 23:44:11	1.33
+++ conga/luci/site/luci/Extensions/conga_constants.py	2007/01/11 22:49:42	1.34
@@ -130,7 +130,7 @@
 
 POSSIBLE_REBOOT_MESSAGE = "This node is not currently responding and is probably rebooting as planned. This state should persist for 5 minutes or so..."
 
-REDIRECT_MSG = " You will be redirected in 5 seconds. Please fasten your safety restraints."
+REDIRECT_MSG = " You will be redirected in 5 seconds."
 
 
 # Homebase-specific constants