Changeset 14230 in genesis

Timestamp:

Nov 21, 2018, 9:11:45 AM (6 years ago)

Author:

rick

Message:

Add gformat feature to disable broken interfaces

Both Meelfabriek2 and PanTerra1 have flapping interfaces

Files:

• nodes/Meelfabriek2/wleiden.yaml (modified) (2 diffs)
• nodes/PanTerra1/wleiden.yaml (modified) (1 diff)
• tools/gformat.py (modified) (3 diffs)

nodes/Meelfabriek2/wleiden.yaml

@@ -51 +51 @@
   ns_mac     : "24:a4:3c:0a:42:5c"
   bridge_type: "NanostationM5"
-  status     : "up"
+  status     : "broken"
 
 
@@ -60 +60 @@
   type       : "eth"
   dhcp       : False
-  status     : "up"
+  status     : "broken"
 
 

nodes/PanTerra1/wleiden.yaml

@@ -48 +48 @@
   ns_mac     : "dc:9f:db:36:1d:af"
   bridge_type: "NanoStationM2"
-  status     : "up"
+  status     : "broken"
 
 

tools/gformat.py

@@ -716 +716 @@
     if ifacedump.has_key('ether'):
         flags_if[ifname]['ether'] = ifacedump['ether']
+
+    # Handle special interface states
+    flags_if[ifname]['status'] = ifacedump['status']
 
     # Add interface IP to list
@@ -998 +1001 @@
       output += "# %s || %s || %s\n" % (iface, addr, comment)
 
+    prefix = ''
+    if flags_if[iface]['status'] == 'broken':
+        output += "# Interface %s disabled since status=broken\n" % iface
+        prefix = '#'
+
     # Write DHCLIENT entry
     if iface in dhclient_if and dhclient_if[iface]:
-      output += "ifconfig_%s='SYNCDHCP'\n\n" % (iface)
+      output += prefix + "ifconfig_%s='SYNCDHCP'\n\n" % (iface)
       continue
     
@@ -1011 +1019 @@
       )
 
+
     idx_offset = 0
     # Set MAC is required
     if flags_if[iface].has_key('ether'):
-      output += "ifconfig_%s='link %s'\n" % (iface, flags_if[iface]['ether'])
-      output += "ifconfig_%s_alias0='inet %s'\n" % (iface, addrs[0][0])
+      output += prefix + "ifconfig_%s='link %s'\n" % (iface, flags_if[iface]['ether'])
+      output += prefix + "ifconfig_%s_alias0='inet %s'\n" % (iface, addrs[0][0])
       idx_offset += 1
     elif iface in bridge_list:  
-      output += "ifconfig_%s_alias0='inet %s'\n" % (iface, addrs[0][0])
+      output += prefix + "ifconfig_%s_alias0='inet %s'\n" % (iface, addrs[0][0])
       idx_offset += 1
     else:   
-      output += "ifconfig_%s='inet %s'\n" % (iface, addrs[0][0])
+      output += prefix + "ifconfig_%s='inet %s'\n" % (iface, addrs[0][0])
         
     for idx, addr in enumerate(addrs[1:]):
-      output += "ifconfig_%s_alias%s='inet %s'\n" % (iface, idx + idx_offset, addr[0]) 
+      output += prefix + "ifconfig_%s_alias%s='inet %s'\n" % (iface, idx + idx_offset, addr[0]) 
 
     output += "\n"