Changeset 10656 in genesis for tools

Timestamp:

May 2, 2012, 11:06:50 PM (13 years ago)

Author:

rick

Message:

Make those very long pool names more understandable.

File:

• tools/gformat.py (modified) (2 diffs)

tools/gformat.py

@@ -1021 +1021 @@
 
 
-  def pool_to_name(node, pool_members):
+  def pool_to_name(fqdn, pool_members):
     """Convert the joined name to a usable pool name"""
 
-    # Get rid of the own entry
-    pool_members = list(set(pool_members) - set([fqdn]))
-
-    target = oldname = ''
+    def isplit(item):
+      (prefix, name, number) = re.match('^(cnode|hybrid|proxy)([a-z]+)([0-9]*)$',item.lower()).group(1,2,3)
+      return (prefix, name, number)
+    
+    my_name = isplit(fqdn.split('.')[0])[1]
+
+    short_names = defaultdict(list)
     for node in sorted(pool_members):
-      (name, number) = re.match('^([A-Za-z]+)([0-9]*)$',node).group(1,2)
-      target += "-" + number if name == oldname else "-" + node if target else node
-      oldname = name
-
-    return target
+      (prefix, name, number) = isplit(node)
+      short_names[name].append((prefix,number))
+
+    return '-'.join(sorted(short_names.keys()))
 
 
@@ -1074 +1076 @@
       for item in value:
         (iface_name, fqdn, ip) = item
-        pool_name = "2pool-" + showaddr(key).replace('.','-') + "-" + pool_to_name(fqdn,pool_members)
+        pool_name = "2pool-" + pool_to_name(fqdn,pool_members)
         wleiden_zone["%s.%s" % (pool_name, fqdn)].append((ip, True))