Changeset 13169 in genesis for tools/gformat.py

Timestamp:

Feb 17, 2015, 8:47:27 PM (10 years ago)

Author:

rick

Message:

Quick to define bridge interfaces, example:

iface_bridge0:

comment : "Link naar RickRing"
ip : "172.16.6.114/28"
sdesc : "2ring"
type : "eth"
dhcp : False
status : "up"
members : "vr1 vr2"

iface_bridge0_alias0:

comment : "Link naar Ed"
ip : "172.17.2.250/29"
sdesc : "2ed"
type : "eth"
dhcp : False
status : "up"

File:

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

tools/gformat.py

@@ -217 +217 @@
         else:
           datadump[key]['autogen_ifname'] = datadump[key]['autogen_ifbase']
+        datadump[key]['autogen_bridge'] = datadump[key]['autogen_ifbase'].startswith('bridge')
+        if datadump[key]['autogen_bridge'] and not 'alias' in key:
+          datadump[key]['autogen_bridge_interfaces'] = datadump[key]['members'].split()
     except Exception as e:
       print "# Error while processing interface %s" % key
@@ -653 +656 @@
       output += ("create_args_%(autogen_ifname)s='wlanmode %(autogen_wlanmode)s mode " +\
         "%(type)s ssid %(ssid)s %(autogen_extra)s channel %(channel)s'\n") % ifacedump
+      output += "\n"
 
     elif ifacedump['type'] in ['ethernet', 'eth']:
       # No special config needed besides IP
-      pass
+      if ifacedump['autogen_bridge']:
+        output += "cloned_interfaces='%(autogen_ifname)s'\n" % ifacedump
+        output += "ifconfig_%s='addm %s up'\n" % (ifacedump['autogen_ifname'], ' addm '.join(ifacedump['autogen_bridge_interfaces']))
+        for member in ifacedump['autogen_bridge_interfaces']:
+          output += "ifconfig_%s='up'\n" % member
+        output += "\n"
     else:
       assert False, "Unknown type " + ifacedump['type']
@@ -839 +848 @@
 
   (addrs_list, dhclient_if, extra_ouput) = make_interface_list(datadump)
-  output += extra_ouput
+  output += extra_ouput.strip() + "\n"
 
   # Print IP address which needs to be assigned over here
@@ -1101 +1110 @@
     ('ns_type', False),
     ('bridge_type', False),
+    ('members', True),
     ('status', True),
   )