Changeset 13929 in genesis for tools

Timestamp:

Jun 21, 2017, 9:32:38 PM (7 years ago)

Author:

rick

Message:

Fix invalid interfaces list with DHCP on alias

When DHCP is configured on a bridge alias it should use the 'real' interface
to listen for DHCP requests instead of the bridgeX.aliasY generated ones.

File:

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

tools/gformat.py

@@ -238 +238 @@
           datadump[key]['autogen_ifname'] = 'wlan%i' % wlan_count
           datadump[key]['autogen_iface'] = 'wlan%i' % wlan_count
+          datadump[key]['autogen_if_dhcp'] = 'wlan%i' % wlan_count
           wlan_count += 1
         else:
+          datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifbase']
           datadump[key]['autogen_ifname'] = '_'.join(key.split('_')[1:])
           if len(key.split('_')) > 2 and key.split('_')[2].isdigit():
@@ -251 +253 @@
       raise
 
-    dhcp_interfaces = [datadump[key]['autogen_ifname'] for key in datadump['autogen_iface_keys'] \
+    dhcp_interfaces = [datadump[key]['autogen_if_dhcp'] for key in datadump['autogen_iface_keys'] \
       if dhcp_type(datadump[key]) == DHCP_SERVER]
 
-    datadump['autogen_dhcp_interfaces'] = [x.replace('_','.') for x in dhcp_interfaces]
+    datadump['autogen_dhcp_interfaces'] = [x.replace('_','.') for x in set(dhcp_interfaces)]
     datadump['autogen_item'] = item