Changeset 13734 in genesis

Timestamp:

Jan 18, 2017, 10:41:57 PM (8 years ago)

Author:

rick

Message:

Keep equal interfaces together, more easy debugging

File:

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

tools/gformat.py

@@ -529 +529 @@
     return '\n'.join(map(lambda x: ' ' * count + x, text.split('\n')))
 
+  # Process DHCP blocks
   dhcp_out = defaultdict(list)
   for iface_key in get_interface_keys(datadump):
@@ -546 +547 @@
 
     if dhcp_type(datadump[iface_key]) != DHCP_SERVER:
-      dhcp_out[iface_key].append(textwrap.dedent("""\
+      dhcp_out[ifname].append(textwrap.dedent("""\
         subnet %(autogen_subnet)s netmask %(autogen_netmask)s {
           ### not autoritive
@@ -562 +563 @@
       fixed = 5
       for mac in datadump['no_portal']:
-        dhcp_out[iface_key].append(textwrap.dedent("""\
+        dhcp_out[ifname].append(textwrap.dedent("""\
             host fixed-%(ifname)s-%(fixed)s {
               hardware ethernet %(mac)s;
@@ -570 +571 @@
       fixed += 1
 
-    dhcp_out[iface_key].append(textwrap.dedent("""\
+    dhcp_out[ifname].append(textwrap.dedent("""\
       subnet %(autogen_subnet)s netmask %(autogen_netmask)s {
         range %(autogen_dhcp_start)s %(autogen_dhcp_stop)s;
@@ -578 +579 @@
       """ % datadump[iface_key]))
 
+  # Output the blocks in groups
   for ifname,value in sorted(dhcp_out.iteritems()):
     if len(value) > 2: