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

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-07-19 22:28:17

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

Log message:
	remaining bits for cluster creation

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

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/07/19 21:38:36	1.5
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/07/19 22:28:17	1.6
@@ -112,6 +112,8 @@
 		return (False, {'errors': errors, 'requestResults':cluster_properties })
 
 	if cluster_properties['isComplete'] == True:
+		from ricci_communicator import RicciCommunicator
+
 		batchNode = createClusterBatch(clusterName, clusterName, map(lambda x: x['ricci_host'], nodeList), True, False, False)
 		if not batchNode:
 			nodeUnauth(nodeList)
--- conga/luci/site/luci/Extensions/homebase_adapters.py	2006/07/19 21:38:36	1.15
+++ conga/luci/site/luci/Extensions/homebase_adapters.py	2006/07/19 22:28:17	1.16
@@ -174,14 +174,14 @@
 		if systemName[:9] == 'localhost' or systemName[:5] == '127.0':
 			systemName = host
 		node = { 'host': host, 'ricci_host': systemName, 'prev_auth': prevAuth, 'cur_auth': True }
+
 		cluster_info = rc.cluster_info()
-		if not cluster or not cluster_info or cluster_info[0] != cluster:
-			if cluster:
-				node['errors'] = 'Node \"' + host + '\" is reporting it is not a member of cluster \"' + cluster + '\"'
-				if cluster_info[0]:
-					node['errors'] += ' and that it is a member of cluster \"' + cluster_info[0] + '\"'
-			else:
-				node['errors'] = 'Node \"' + host + '\" reports it is a member of cluster \"' + cluster_info[0] + '\"'
+		if cluster and ((not cluster_info) or (cluster_info[0] != cluster)):
+			node['errors'] = 'Node \"' + host + '\" is reporting it is not a member of cluster \"' + cluster + '\"'
+			if cluster_info and cluster_info[0]:
+				node['errors'] += ' and that it is a member of cluster \"' + cluster_info[0] + '\"'
+		if not cluster and cluster_info and cluster_info[0]:
+			node['errors'] = 'Node \"' + host + '\" reports it is a member of cluster \"' + cluster_info[0] + '\"'
 		return node
 
 	error = 'Unable to authenticate to the ricci agent on \"' + host + '\"'
--- conga/luci/site/luci/Extensions/ricci_bridge.py	2006/07/19 21:38:36	1.6
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2006/07/19 22:28:17	1.7
@@ -572,4 +572,4 @@
     batch += '</module>'
     batch += '</batch>'
 
-	return minidom.parseString(batch).firstChild
+    return minidom.parseString(batch).firstChild