Changeset 13735 in genesis

Timestamp:

Jan 18, 2017, 10:47:59 PM (8 years ago)

Author:

rick

Message:

autogen_ifname is ambigious since introduction of vlans.

dhcpd grouping should not group vlans since they are seperate interfaces (as
DHCP is concerned), where-as normal aliases should be grouped.

File:

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

tools/gformat.py

@@ -533 +533 @@
   for iface_key in get_interface_keys(datadump):
     ifname = datadump[iface_key]['autogen_ifbase']
+    groupif = ifname if not datadump[iface_key]['autogen_vlan'] else iface_key
     if not datadump[iface_key].has_key('comment'):
       datadump[iface_key]['comment'] = None
@@ -539 +540 @@
       continue
 
-    dhcp_out[iface_key].append("## %(autogen_iface)s - %(comment)s\n" % datadump[iface_key])
+    dhcp_out[groupif].append("## %(autogen_iface)s - %(comment)s\n" % datadump[iface_key])
 
     (addr, mask) = datadump[iface_key]['ip'].split('/')
@@ -547 +548 @@
 
     if dhcp_type(datadump[iface_key]) != DHCP_SERVER:
-      dhcp_out[ifname].append(textwrap.dedent("""\
+      dhcp_out[groupif].append(textwrap.dedent("""\
         subnet %(autogen_subnet)s netmask %(autogen_netmask)s {
           ### not autoritive
@@ -563 +564 @@
       fixed = 5
       for mac in datadump['no_portal']:
-        dhcp_out[ifname].append(textwrap.dedent("""\
+        dhcp_out[groupif].append(textwrap.dedent("""\
             host fixed-%(ifname)s-%(fixed)s {
               hardware ethernet %(mac)s;
@@ -571 +572 @@
       fixed += 1
 
-    dhcp_out[ifname].append(textwrap.dedent("""\
+    dhcp_out[groupif].append(textwrap.dedent("""\
       subnet %(autogen_subnet)s netmask %(autogen_netmask)s {
         range %(autogen_dhcp_start)s %(autogen_dhcp_stop)s;