Changeset 13404 in genesis


Ignore:
Timestamp:
Sep 20, 2015, 7:09:40 PM (7 years ago)
Author:
rick
Message:

Removing references to old CNode and Hybrid prefixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/gformat.py

    r13403 r13404  
    299299  return str(addr).startswith('172.')
    300300
    301 def get_system_list(prefix):
    302   return sorted([os.path.basename(os.path.dirname(x)) for x in glob.glob("%s/%s*/wleiden.yaml" % (NODE_DIR, prefix))])
    303 
    304 get_hybridlist = lambda: get_system_list("Hybrid")
    305 get_nodelist = lambda: get_system_list("CNode")
    306 get_proxylist = lambda: get_system_list("Proxy")
    307 
    308301def get_hostlist():
    309302  """ Combined hosts and proxy list"""
    310   return get_nodelist() + get_proxylist() + get_hybridlist()
     303  return sorted([os.path.basename(os.path.dirname(x)) for x in glob.glob("%s/*/wleiden.yaml" % (NODE_DIR))])
    311304
    312305def angle_between_points(lat1,lat2,long1,long2):
     
    705698
    706699  if not ileiden_proxies or not normal_proxies:
    707     for proxy in get_proxylist():
    708       proxydump = get_yaml(proxy)
    709       if proxydump['ileiden']:
    710         ileiden_proxies.append(proxydump)
    711       else:
    712         normal_proxies.append(proxydump)
    713     for host in get_hybridlist():
     700    for host in get_hostlist():
    714701      hostdump = get_yaml(host)
    715702      if hostdump['status'] == 'up':
     
    950937    return nameservers_cache[0:max_servers]
    951938
    952   for host in get_hybridlist():
     939  for host in get_hostlist():
    953940    hostdump = get_yaml(host)
    954941    if hostdump['status'] == 'up' and (hostdump['service_proxy_ileiden'] or hostdump['service_proxy_normal']):
    955       nameservers_cache.append((hostdump['masterip'], hostdump['autogen_realname']))
    956   for host in get_proxylist():
    957     hostdump = get_yaml(host)
    958     if hostdump['status'] == 'up':
    959942      nameservers_cache.append((hostdump['masterip'], hostdump['autogen_realname']))
    960943
     
    10411024  datadump['autogen_header'] = generate_header(datadump, "#")
    10421025  datadump['autogen_ntp_servers'] = ''
    1043   for host in get_proxylist():
    1044     hostdump = get_yaml(host)
    1045     datadump['autogen_ntp_servers'] += "server %(masterip)-15s iburst maxpoll 9 # %(autogen_realname)s\n" % hostdump
    1046   for host in get_hybridlist():
     1026  for host in get_hostlist():
    10471027    hostdump = get_yaml(host)
    10481028    if hostdump['service_proxy_ileiden'] or hostdump['service_proxy_normal']:
Note: See TracChangeset for help on using the changeset viewer.