Changeset 9286 in genesis

Timestamp:

Jun 23, 2011, 7:33:04 PM (14 years ago)

Author:

rick

Message:

The pool has to be formatted smarter, else the name execed the maximum allowed characters.

File:

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

tools/gformat.py

@@ -8 +8 @@
 import sys
 import os
+import re
 sys.path.append(os.path.dirname(__file__))
 
@@ -591 +592 @@
         continue
 
+
+  def pool_to_name(node, 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 = ''
+    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
+
+
   # Automatic naming convention of interlinks namely 2 + remote.lower()
   for (key,value) in pool.iteritems():
@@ -605 +622 @@
       for item in value:
         (iface_name, fqdn, ip) = item
-        pool_name = "2pool-" + showaddr(key).replace('.','-') + "-" + "-".join(sorted(list(set(pool_members) - set([fqdn]))))
+        pool_name = "2pool-" + showaddr(key).replace('.','-') + "-" + pool_to_name(fqdn,pool_members)
         wleiden_zone["%s.%s" % (pool_name, fqdn)] = ip