Changeset 10461 in genesis

Timestamp:

Apr 12, 2012, 9:27:12 PM (13 years ago)

Author:

rick

Message:

Make sure Hybrid fall under totally new category and include items in proxies
lists for example. Also allow DNS entry to be 'core'

File:

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

tools/gformat.py

@@ -81 +81 @@
   gfile = os.path.join(NODE_DIR,item,'wleiden.yaml')
 
+  # Use some boring defaults
+  datadump = { 'service_proxy' : False, 'service_ileiden' : False }
   f = open(gfile, 'r')
-  datadump = yaml.load(f,Loader=Loader)
+  datadump.update(yaml.load(f,Loader=Loader))
   f.close()
 
@@ -151 +153 @@
 
 def get_hybridlist():
-  """Get all available proxies hybridX sorting based on X number"""
-  hybridlist = sorted([os.path.basename(x) for x in glob.glob("%s/hybrid*" % NODE_DIR)],
-                key=lambda name: int(''.join([c for c in name if c in string.digits])),
-                cmp=lambda x,y: x - y)
+  """Get all available hybrid nodes/proxies"""
+  hybridlist = sorted([os.path.basename(x) for x in glob.glob("%s/Hybrid*" % NODE_DIR)])
   return hybridlist
 
@@ -446 +446 @@
     else:
       normal_proxies.append(proxydump)
+  for host in get_hybridlist():
+    hostdump = get_yaml(host)
+    if hostdump['service_ileiden']:
+      ileiden_proxies.append(hostdump)
+    if hostdump['service_proxy']:
+      normal_proxies.append(hostdump)
+
   datadump['autogen_ileiden_proxies'] = ','.join([x['masterip'] for x in ileiden_proxies])
   datadump['autogen_ileiden_proxies_names'] = ','.join([x['autogen_item'] for x in ileiden_proxies])
@@ -877 +884 @@
     # Proxy naming convention is special
     fqdn = datadump['autogen_realname']
-    if datadump['nodetype'] == 'CNode':
+    if datadump['nodetype'] in ['CNode', 'Hybrid']:
       wleiden_cname[datadump['nodename']] = fqdn
 
@@ -897 +904 @@
         # First push it into a pool, to indentify the counter-part later on
         addr = parseaddr(ip)
-        netmask = int(netmask)
-        addr = addr & ~((1 << (32 - netmask)) - 1)
+        cidr = int(cidr)
+        addr = addr & ~((1 << (32 - cidr)) - 1)
         if pool.has_key(addr):
           pool[addr] += [(iface_name, fqdn, ip)]