Changeset 13524 in genesis

Timestamp:

Dec 16, 2015, 8:54:23 PM (9 years ago)

Author:

rick

Message:

Quirck to group DHCP interfaces into newly defined bridge0 interface and all
others (which do not have DHCP by definition) are to be set as non autoritive ones.

File:

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

tools/gformat.py

@@ -509 +509 @@
 # Interface definitions
 #
-\n""").render(datadump)
+\n\n""").render(datadump)
+
+
+  # TODO: Use textwrap.fill instead
+  def indent(text, count):
+    return '\n'.join(map(lambda x: ' ' * count + x, text.split('\n')))
 
   dhcp_out = defaultdict(list)
@@ -518 +523 @@
 
     if dhcp_type(datadump[iface_key]) != DHCP_SERVER:
-      dhcp_out[iface_key].append("  ## %(autogen_ifname)s - %(comment)s\n" % datadump[iface_key])
+      dhcp_out[iface_key].append("## %(autogen_ifname)s - %(comment)s\n" % datadump[iface_key])
     else:
-      dhcp_out[ifname].append("  ## %(autogen_ifname)s - %(comment)s\n" % datadump[iface_key])
+      dhcp_out['bridge0'].append("   ## %(autogen_ifname)s - %(comment)s\n" % datadump[iface_key])
 
     (addr, mask) = datadump[iface_key]['ip'].split('/')
@@ -526 +531 @@
     datadump[iface_key]['autogen_netmask'] = cidr2netmask(mask)
     datadump[iface_key]['autogen_subnet'] = get_network(addr, mask)
+
     if dhcp_type(datadump[iface_key]) != DHCP_SERVER:
-      dhcp_out[iface_key].append("  subnet %(autogen_subnet)s netmask %(autogen_netmask)s {\n    ### not autoritive\n  }\n" % \
-        datadump[iface_key])
+      dhcp_out[iface_key].append(textwrap.dedent("""\
+        subnet %(autogen_subnet)s netmask %(autogen_netmask)s {
+          ### not autoritive
+        }
+      """ % datadump[iface_key]))
       continue
 
@@ -540 +549 @@
       fixed = 5
       for mac in datadump['no_portal']:
-        dhcp_out[ifname].append("""\
+        dhcp_out['bridge0'].append("""\
    host fixed-%(ifname)s-%(fixed)s {
      hardware ethernet %(mac)s;
@@ -548 +557 @@
       fixed += 1
 
-    dhcp_out[ifname].append("""\
+    dhcp_out['bridge0'].append("""\
    subnet %(autogen_subnet)s netmask %(autogen_netmask)s {
      range %(autogen_dhcp_start)s %(autogen_dhcp_stop)s;
@@ -554 +563 @@
      option domain-name-servers %(autogen_addr)s;
    }
+
 """ % datadump[iface_key])
 
   for ifname,value in dhcp_out.iteritems():
-    output += ("shared-network %s {\n" % ifname) + ''.join(value)  + '}\n\n'
+    if ifname == 'bridge0':
+      output += ("shared-network %s {\n" % ifname) + ''.join(value)  + '}\n\n'
+    else:
+      output += ''.join(value) + "\n\n"
   return output