[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-10-16 04:51:32

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

Log message:
	small fixes

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

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/16 04:26:19	1.111
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/16 04:51:32	1.112
@@ -2074,13 +2074,14 @@
 		#and send out new cluster.conf
 		delete_target = None
 		try:
-			nodelist = model.getClusterNodesPtr().getChildren()
+			nodelist = model.getNodes()
+			find_node = lower(nodename)
 			for n in nodelist:
-				if n.getName() == nodename:
+				if lower(n.getName()) == find_node:
 					delete_target = n
 					break
 		except:
-			return None
+			pass
 
 		if delete_target is None:
 			return None
@@ -2091,6 +2092,8 @@
 
 		# propagate the new cluster.conf via the second node
 		batch_number, result = setClusterConf(rc2, str(str_buf))
+		if batch_number is None:
+			return None
 
 		#Now we need to delete the node from the DB
 		path = str(CLUSTER_FOLDER_PATH + clustername)
--- conga/luci/site/luci/Extensions/storage_adapters.py	2006/10/15 22:34:54	1.6
+++ conga/luci/site/luci/Extensions/storage_adapters.py	2006/10/16 04:51:32	1.7
@@ -121,7 +121,7 @@
     ssys['Description'] = "Configure storage on " + system_data['hostname']
     
     if pagetype == STORAGE:
-      if stoname == system[0]:
+      if stoname == system_data['hostname']:
         ssys['currentItem'] = True
       else:
         ssys['currentItem'] = False