Changeset 13279 in genesis

Timestamp:

Jun 13, 2015, 7:48:44 PM (10 years ago)

Author:

rick

Message:

Fix listing of systems for CLI purposes

File:

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

tools/gformat.py

@@ -174 +174 @@
       'autogen_revision' : 'NOTFOUND',
       'autogen_gfile' : gfile,
+      'service_proxy_ileiden' : False, 
     }
     f = open(gfile, 'r')
@@ -184 +185 @@
       defaults = { 
         'service_proxy_normal' : False, 
-        'service_proxy_ileiden' : False, 
         'service_accesspoint' : True, 
         'service_incoming_rdr' : False, 
@@ -2027 +2027 @@
     elif sys.argv[1] == "list":
       use_fqdn = False
-      if len(sys.argv) < 4 or not sys.argv[2] in ["up", "down", "planned", "all"]:
+      if len(sys.argv) < 4:
         usage()
-      if sys.argv[3] == "nodes":
-        systems = get_nodelist()
-      elif sys.argv[3] == "proxies":
-        systems = get_proxylist()
-      elif sys.argv[3] == "systems":
-        systems = get_hostlist()
-      else:
+      if not sys.argv[2] in ["up", "down", "planned", "all"]:
         usage()
+      if not sys.argv[3] in ["nodes","proxies","systems"]:
+        usage()
+
       if len(sys.argv) > 4:
         if sys.argv[4] == "fqdn":
@@ -2043 +2040 @@
           usage()
 
-      for system in systems:
+      for system in get_hostlist():
        datadump = get_yaml(system)
+       if sys.argv[3] == 'proxies' and not datadump['service_proxy_ileiden']:
+         continue
 
        output = datadump['autogen_fqdn'] if use_fqdn else system