Changeset 14408 in genesis

Timestamp:

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

Author:

rick

Message:

Add extra devices in motd listing for quick access

Files:

• nodes/PVKerkDuif/wleiden.yaml (modified) (4 diffs)
• tools/gformat.py (modified) (2 diffs)

nodes/PVKerkDuif/wleiden.yaml

@@ -26 +26 @@
 
 iface_vr0:
-  comment    : "Link naar switch PVKerkDuif Network, camera c4:d6:55:3e:19:3f at .66"
+  comment    : "Link naar switch PVKerkDuif Network"
   ip         : "172.17.13.65/28"
   sdesc      : "2building"
@@ -33 +33 @@
   status     : "up"
 
+iface_vr0_extra0:
+  comment    : "Parkeerplaats - Webcam"
+  sdesc      : "webcam-buiten"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+  bridge_type: "Foscam"
+  ip         : "172.17.13.66/24"
+  mac        : "c4:d6:55:3e:19:3f"
 
 iface_vr1:
@@ -51 +60 @@
 
 iface_vr2:
-  comment    : "AccessPoint Sportvelden via NanoStation, peer 00:27:22:E2:53:DD 172.17.20.3"
+  comment    : "AccessPoint Sportvelden"
   ip         : "172.17.20.1/24"
   sdesc      : "2sportvelden"
   mode       : "ap-wds"
   type       : "eth"
-  channel    : "11"
+  channel    : "1"
   ssid       : "ap-ZTW-PVKerkDuif-Buiten"
   dhcp       : "11-250"
@@ -64 +73 @@
   status     : "up"
 
+iface_vr2_extra0:
+  comment    : "AccessPoint Veld11 Buiten"
+  sdesc      : "veld11"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+  bridge_type: "NanoStation M5"
+  ip         : "172.17.20.3/24"
+  mac        : "00:27:22:80:5a:b6"
 
+iface_vr2_extra1:
+  comment    : "AccessPoint Veld11 Binnen"
+  sdesc      : "veld11"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+  bridge_type: "Bullet2"
+  ip         : "172.17.20.4/24"
+  mac        : "00:27:22:f2:f1:f0"
+
+iface_vr2_extra2:
+  comment    : "Veld11 - Webcam"
+  sdesc      : "webcam-veld11"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+  bridge_type: "airCam"
+  ip         : "172.17.20.5/24"
+  mac        : "00:27:22:60:43:da"

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),