Changeset 10936 in genesis for tools/gformat.py

Timestamp:

May 20, 2012, 1:16:06 AM (13 years ago)

Author:

rick

Message:

Fixed ordering please, prefer the Good Hybrids first.

File:

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

tools/gformat.py

@@ -824 +824 @@
 
 
-nameservers_cache = {}
+nameservers_cache = []
 def get_nameservers():
   if nameservers_cache:
     return nameservers_cache
 
-  for host in get_proxylist():
-    hostdump = get_yaml(host)
-    nameservers_cache[hostdump['masterip']] = hostdump['autogen_realname'] 
   for host in get_hybridlist():
     hostdump = get_yaml(host)
     if hostdump['service_proxy_ileiden'] or hostdump['service_proxy_normal']:
-      nameservers_cache[hostdump['masterip']] = hostdump['autogen_realname'] 
+      nameservers_cache.append((hostdump['masterip'], hostdump['autogen_realname']))
+  for host in get_proxylist():
+    hostdump = get_yaml(host)
+    nameservers_cache.append((hostdump['masterip'], hostdump['autogen_realname']))
 
   return nameservers_cache
@@ -847 +847 @@
 
 
-  for masterip,realname in get_nameservers().iteritems():
+  for masterip,realname in get_nameservers():
     datadump['autogen_edge_nameservers'] += "nameserver %-15s # %s\n" % (masterip, realname)