Changeset 13930 in genesis for tools/gformat.py

Timestamp:

Jun 21, 2017, 10:35:31 PM (8 years ago)

Author:

rick

Message:

Fix adding of interface members of bridge(4)

create_args_ is not supported for bridge creation, how-ever when using
ifconfig_ some trickery is required to support IP assignments as all needs to
be 'shifted' to aliasX interfacing.

Note alias creation is flawed by design as they all have to have unique keys,
thus we rely on _aliasX definitions for alias creation, where-as we should
parse the entries instead. Thus make_interface_list has to hack support for
bridge aliases which do require this tooling.

File:

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

tools/gformat.py

@@ -225 +225 @@
         datadump[key]['autogen_bridge_member'] = datadump[key].has_key('parent')
         datadump[key]['autogen_bridge'] = datadump[key]['autogen_ifbase'].startswith('bridge')
+        datadump[key]['autogen_bridge_alias'] = datadump[key]['autogen_ifbase'].startswith('bridge') and '_alias' in key
 
         if datadump[key].has_key('parent'):
@@ -701 +702 @@
   for iface_key in get_interface_keys(datadump):
     ifacedump = datadump[iface_key]
-    ifname = ifacedump['autogen_ifname']
+    if ifacedump['autogen_bridge_alias']:
+      ifname = ifacedump['autogen_ifbase']
+    else:
+      ifname = ifacedump['autogen_ifname']
 
     # If defined as vlan interface
@@ -710 +714 @@
     if ifacedump['autogen_bridge_member']:
       bridge_list[ifacedump['parent']].append(ifacedump['autogen_iface'])
+
 
     # Flag dhclient is possible
@@ -980 +985 @@
     
   for iface in bridge_list.keys():
-    output += "create_args_%s='%s'\n" % (iface, ' '.join(['addm %(iface)s private %(iface)s' % {'iface': x} for x in bridge_list[iface]]))
+    output += "ifconfig_%s='%s up'\n" % (iface, ' '.join(['addm %(iface)s private %(iface)s' % {'iface': x} for x in bridge_list[iface]]))
 
   # Bridge member interfaces not containing a configuration should be marked active explcitly.
@@ -1017 +1022 @@
     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])
+      idx_offset += 1
+    elif iface in bridge_list:  
       output += "ifconfig_%s_alias0='inet %s'\n" % (iface, addrs[0][0])
       idx_offset += 1