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

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

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2007-01-10 23:33:29

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

Log message:
	fix fencedev marker for bz212021

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.199&r2=1.200

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2007/01/10 22:45:35	1.199
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2007/01/10 23:33:27	1.200
@@ -4387,7 +4387,7 @@
           last_kid_fd = None
           level1.append(fencedev)
         else:  #This dev is shared
-          if (last_kid_fd is not None) and (fd.getName().strip() == last_kid_fd.getName().strip()):  #just append a new instance struct to last_kid_fd
+          if (last_kid_fd is not None) and (fd.getName().strip() == last_kid_fd['name'].strip()):  #just append a new instance struct to last_kid_fd
             instance_struct = {}
             instance_struct['id'] = str(minor_num)
             minor_num = minor_num + 1
@@ -4400,7 +4400,7 @@
             #Now just add this struct to last_kid_fd and reset last_kid_fd
             ilist = last_kid_fd['instance_list']
             ilist.append(instance_struct)
-            last_kid_fd = fd
+            #last_kid_fd = fd
             continue
           else: #Shared, but not used above...so we need a new fencedev struct
             fencedev = {}
@@ -4428,7 +4428,7 @@
               instance_struct[kee] = kidattrs[kee]
             inlist.append(instance_struct) 
             level1.append(fencedev)
-            last_kid_fd = fd
+            last_kid_fd = fencedev
             continue
     map['level1'] = level1
 
@@ -4494,7 +4494,7 @@
           last_kid_fd = None
           level2.append(fencedev)
         else:  #This dev is shared
-          if (last_kid_fd is not None) and (fd.getName().strip() == last_kid_fd.getName().strip()):  #just append a new instance struct to last_kid_fd
+          if (last_kid_fd is not None) and (fd.getName().strip() == last_kid_fd['name'].strip()):  #just append a new instance struct to last_kid_fd
             instance_struct = {}
             instance_struct['id'] = str(minor_num)
             minor_num = minor_num + 1
@@ -4507,7 +4507,7 @@
             #Now just add this struct to last_kid_fd and reset last_kid_fd
             ilist = last_kid_fd['instance_list']
             ilist.append(instance_struct)
-            last_kid_fd = fd
+            #last_kid_fd = fd
             continue
           else: #Shared, but not used above...so we need a new fencedev struct
             fencedev = {}
@@ -4535,7 +4535,7 @@
               instance_struct[kee] = kidattrs[kee]
             inlist.append(instance_struct) 
             level2.append(fencedev)
-            last_kid_fd = fd
+            last_kid_fd = fencedev
             continue
     map['level2'] = level2