Changeset 14408 in genesis for tools

Timestamp:

Dec 16, 2019, 8:49:59 PM (5 years ago)

Author:

rick

Message:

Add extra devices in motd listing for quick access

File:

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

tools/gformat.py

@@ -1115 +1115 @@
     ifacedump = datadump[iface_key]
 
-    if not 'ns_ip' in ifacedump:
+    if 'mac' in ifacedump:
+      x_ip = ifacedump['ip'].split('/')[0]
+      x_mode = 'active' if ifacedump.get('status') == 'up' else 'disabled'
+    elif 'ns_ip' in ifacedump:
+      x_ip = ifacedump['ns_ip'].split('/')[0]
+      x_mode = ifacedump.get('mode') or 'unknown'
+    else:
       continue
 
-    x_ip = ifacedump['ns_ip'].split('/')[0]
-
-    if 'mode' in ifacedump:
-      x_mode = ifacedump['mode']
-    else:
-      x_mode = 'unknown'
-
-    if 'bridge_type' in ifacedump:
-      device_type = ifacedump['bridge_type']
-    else:
-      device_type = 'Unknown'
-
-    table.append((ifacedump['autogen_iface'], x_mode, 'http://%s' % x_ip if url else x_ip, device_type))
+    device_type = ifacedump.get('bridge_type') or 'Unknown'
+    table.append((ifacedump['autogen_iface'], x_mode, 'http://%s' % x_ip if url else x_ip, "%s (%s)" % (device_type, ifacedump.get('comment',''))))
+
   return table
 
@@ -1377 +1373 @@
     ('ns_mac', False),
     ('bullet2_mac', False),
+    ('mac', False),
     ('ns_type', False),
     ('bridge_type', False),