Changeset 10919 in genesis for tools

Timestamp:

May 19, 2012, 5:00:51 PM (13 years ago)

Author:

rick

Message:

Ik ben die lange en verwarrende pool dns namen meer dan zat, zoals:

2pool-unigor-unigorn.cnodeunigor1.wleiden.net

Aangezien er een enkele ethernet backbone per locatie (tussen alle nodes dmv
van een switch) is het handiger wat korte naam te geven:

2ring.cnodeunigor1.wleiden.net

File:

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

tools/gformat.py

@@ -1208 +1208 @@
 
 
-  def pool_to_name(fqdn, pool_members):
-    """Convert the joined name to a usable pool name"""
-
-    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):
-      (prefix, name, number) = isplit(node)
-      short_names[name].append((prefix,number))
-
-    return '-'.join(sorted(short_names.keys()))
-
 
   #  WL uses an /29 to configure an interface. IP's are ordered like this: 
@@ -1263 +1247 @@
       for item in value:
         (iface_name, fqdn, ip) = item
-        pool_name = "2pool-" + pool_to_name(fqdn,pool_members)
-        wleiden_zone["%s.%s" % (pool_name, fqdn)].append((ip, True))
+        wleiden_zone["2ring.%s" % (fqdn)].append((ip, True))
 
   # Include static DNS entries