Changeset 13404 in genesis

Timestamp:

Sep 20, 2015, 7:09:40 PM (9 years ago)

Author:

rick

Message:

Removing references to old CNode and Hybrid prefixes

File:

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

tools/gformat.py

@@ -299 +299 @@
   return str(addr).startswith('172.')
 
-def get_system_list(prefix):
-  return sorted([os.path.basename(os.path.dirname(x)) for x in glob.glob("%s/%s*/wleiden.yaml" % (NODE_DIR, prefix))])
-
-get_hybridlist = lambda: get_system_list("Hybrid")
-get_nodelist = lambda: get_system_list("CNode")
-get_proxylist = lambda: get_system_list("Proxy")
-
 def get_hostlist():
   """ Combined hosts and proxy list"""
-  return get_nodelist() + get_proxylist() + get_hybridlist()
+  return sorted([os.path.basename(os.path.dirname(x)) for x in glob.glob("%s/*/wleiden.yaml" % (NODE_DIR))])
 
 def angle_between_points(lat1,lat2,long1,long2):
@@ -705 +698 @@
 
   if not ileiden_proxies or not normal_proxies:
-    for proxy in get_proxylist():
-      proxydump = get_yaml(proxy)
-      if proxydump['ileiden']:
-        ileiden_proxies.append(proxydump)
-      else:
-        normal_proxies.append(proxydump)
-    for host in get_hybridlist():
+    for host in get_hostlist():
       hostdump = get_yaml(host)
       if hostdump['status'] == 'up':
@@ -950 +937 @@
     return nameservers_cache[0:max_servers]
 
-  for host in get_hybridlist():
+  for host in get_hostlist():
     hostdump = get_yaml(host)
     if hostdump['status'] == 'up' and (hostdump['service_proxy_ileiden'] or hostdump['service_proxy_normal']):
-      nameservers_cache.append((hostdump['masterip'], hostdump['autogen_realname']))
-  for host in get_proxylist():
-    hostdump = get_yaml(host)
-    if hostdump['status'] == 'up':
       nameservers_cache.append((hostdump['masterip'], hostdump['autogen_realname']))
 
@@ -1041 +1024 @@
   datadump['autogen_header'] = generate_header(datadump, "#")
   datadump['autogen_ntp_servers'] = ''
-  for host in get_proxylist():
-    hostdump = get_yaml(host)
-    datadump['autogen_ntp_servers'] += "server %(masterip)-15s iburst maxpoll 9 # %(autogen_realname)s\n" % hostdump
-  for host in get_hybridlist():
+  for host in get_hostlist():
     hostdump = get_yaml(host)
     if hostdump['service_proxy_ileiden'] or hostdump['service_proxy_normal']: