Changeset 14054 in genesis for tools/gformat.py

Timestamp:

Feb 20, 2018, 7:00:50 PM (7 years ago)

Author:

rick

Message:

Fix dhcpd not starting at StJan

StJan VLAN switch also has regular plain switch connected to unit which
requires aliases interfaces. This requires the dhcpd.conf to include this
aliases into a shared network else dhcpd refuses to start.

File:

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

tools/gformat.py

@@ -210 +210 @@
         datadump[key]['autogen_ifbase'] = key.split('_')[1]
         datadump[key]['autogen_vlan'] = False
+        datadump[key]['autogen_vlan_alias'] = False
 
         datadump[key]['autogen_bridge_member'] = datadump[key].has_key('parent')
@@ -232 +233 @@
           datadump[key]['autogen_ifname'] = '_'.join(key.split('_')[1:])
           if len(key.split('_')) > 2 and key.split('_')[2].isdigit():
+            datadump[key]['autogen_if_dhcp'] = '.'.join(key.split('_')[1:3])
             datadump[key]['autogen_vlan'] = key.split('_')[2]
+            datadump[key]['autogen_vlan_alias'] = '_alias' in key
             datadump[key]['autogen_iface'] = '.'.join(key.split('_')[1:])
             datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifname']
           else:
+            datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifbase']
             datadump[key]['autogen_iface'] = '_'.join(key.split('_')[1:])
             datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifbase']
-        print key,datadump[key]['autogen_iface'], datadump[key]['autogen_ifname'], datadump[key]['autogen_if_dhcp']
 
     except Exception as exc: