Changeset 13504 in genesis for tools/gformat.py

Timestamp:

Nov 25, 2015, 10:04:12 AM (9 years ago)

Author:

rick

Message:

• Members of interfaces should be included into the creating of the interface.
• Interfaces should be brought up explicitly if no IP is configured on it.

File:

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

tools/gformat.py

@@ -880 +880 @@
   output += "\n"
   output += "cloned_interfaces='bridge0'\n"
-  output += "ifconfig_bridge0='addm %s up'\n" % ' addm '.join(datadump['autogen_dhcp_interfaces'])
 
   # Details like SSID
@@ -903 +902 @@
         cmp=lambda x,y: cmp(1 if x == '172' else 0, 1 if y == '172' else 0)
       )
-    output += "ifconfig_%s='inet %s'\n" % (iface, addrs[0][0])
+
+    if iface == 'bridge0':
+      output += "ifconfig_bridge0='addm %s %s up'\n" % (' addm '.join(datadump['autogen_dhcp_interfaces']), addrs[0][0])
+    else:
+      output += "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, addr[0]) 
+    if iface == 'bridge0':
+      for dhcp_iface in datadump['autogen_dhcp_interfaces']:
+        output += "ifconfig_%s='up'\n" % dhcp_iface.replace('.','_')
     output += "\n"