Index: tools/gformat.py
===================================================================
--- tools/gformat.py	(revision 10599)
+++ tools/gformat.py	(revision 10611)
@@ -1276,4 +1276,5 @@
         store_yaml(datadump)
     elif sys.argv[1] == "list":
+      use_fqdn = False
       if len(sys.argv) < 4 or not sys.argv[2] in ["up", "down", "planned", "all"]:
         usage()
@@ -1286,10 +1287,18 @@
       else:
         usage()
+      if len(sys.argv) > 4:
+        if sys.argv[4] == "fqdn":
+          use_fqdn = True
+        else:
+          usage()
+
       for system in systems:
        datadump = get_yaml(system)
+
+       output = datadump['autogen_fqdn'] if use_fqdn else system
        if sys.argv[2] == "all":
-         print system
+         print output
        elif datadump['status'] == sys.argv[2]:
-         print system
+         print output
     elif sys.argv[1] == "create":
       if sys.argv[2] == "network.kml":