Changeset 10692 in genesis

Timestamp:

May 6, 2012, 8:44:45 PM (13 years ago)

Author:

rick

Message:

_only_ directories with a wleiden.yaml are valid node items.

Location:

tools

Files:

• dubbelipcheck.sh (deleted)
• gformat.py (modified) (2 diffs)

tools/gformat.py

@@ -161 +161 @@
 
 
-def get_proxylist():
-  """Get all available proxies proxyX sorting based on X number"""
-  proxylist = sorted([os.path.basename(x) for x in glob.glob("%s/proxy*" % NODE_DIR)],
-                key=lambda name: int(''.join([c for c in name if c in string.digits])),
-                cmp=lambda x,y: x - y) + sorted([os.path.basename(x) for x in glob.glob("%s/Proxy*" % NODE_DIR)])
-  return proxylist
-
-def get_hybridlist():
-  """Get all available hybrid nodes/proxies"""
-  hybridlist = sorted([os.path.basename(x) for x in glob.glob("%s/Hybrid*" % NODE_DIR)])
-  return hybridlist
-
 
 def valid_addr(addr):
@@ -178 +166 @@
   return str(addr).startswith('172.')
 
-
-def get_nodelist():
-  """ Get all available nodes - sorted """
-  nodelist = sorted([os.path.basename(x) for x in glob.glob("%s/CNode*" % NODE_DIR)])
-  return nodelist
+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():