[Cluster-devel] conga/luci cluster/form-macros site/luci/Exten ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-07-20 16:59:33

Modified files:
	luci/cluster   : form-macros 
	luci/site/luci/Extensions: cluster_adapters.py 

Log message:
	provisionally add clusters to the management interface while deployment is in progress

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.6&r2=1.7

--- conga/luci/cluster/form-macros	2006/07/19 20:20:53	1.5
+++ conga/luci/cluster/form-macros	2006/07/20 16:59:33	1.6
@@ -104,7 +104,7 @@
 			<tfoot class="systemsTable">
 				<tr class="systemsTable"><td colspan="2" class="systemsTable">
 					<div>
-						<input type="checkbox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);"/> Check if storage system passwords are identical.
+						<input type="checkbox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);"/> Check if cluster node passwords are identical.
 					</div>
 				</td></tr>
 
@@ -362,7 +362,7 @@
 			<tfoot class="systemsTable">
 				<tr class="systemsTable"><td colspan="2" class="systemsTable">
 					<div id="allSameDiv">
-						<input type="checkbox" class="allSameCheckBox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);"/> Check if storage system passwords are identical.
+						<input type="checkbox" class="allSameCheckBox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);"/> Check if cluster node passwords are identical.
 					</div>
 				</td></tr>
 
--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/07/19 22:28:17	1.6
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/07/20 16:59:33	1.7
@@ -14,11 +14,11 @@
 #then only display chooser if the current user has 
 #permissions on at least one. If the user is admin, show ALL clusters
 
-from homebase_adapters import nodeAuth, nodeUnauth                     
+from homebase_adapters import nodeAuth, nodeUnauth, manageCluster
 
 CLUSTER_FOLDER_PATH = '/luci/systems/cluster/'
 
-def validatePost(request):
+def validatePost(self, request):
 	if int(request.form['pagetype']) != 6:
 		return
 
@@ -121,6 +121,13 @@
 			errors.append('Unable to generate cluster creation ricci command')
 			return (False, {'errors': errors, 'requestResults':cluster_properties })
 
+		error = manageCluster(self, clusterName, nodeList)
+		if error:
+			nodeUnauth(nodeList)
+			cluster_properties['isComplete'] = False
+			errors.append(error)
+			return (False, {'errors': errors, 'requestResults':cluster_properties })
+
 		for i in nodeList:
 			try:
 				rc = RicciCommunicator(i['ricci_host'])
@@ -138,7 +145,7 @@
   dummynode = {}
   
   if request.REQUEST_METHOD == 'POST':
-    ret = validatePost(request)
+    ret = validatePost(self, request)
     try:
 		request.SESSION.set('checkRet', ret[1])
     except: