Changeset 14053 in genesis for tools/gformat.py

Timestamp:

Feb 20, 2018, 2:54:34 PM (7 years ago)

Author:

rick

Message:

Fix alias VLAN dhcp declaration not mapped to shared-network

While here make all entries-shared networks, since it does not harm anyways:

Note that even when the shared-network declaration is absent, an empty
one is created by the server to contain the subnet (and any scoped
parameters included in the subnet). For practical purposes, this means
that "stateless" DHCP clients, which are not tied to addresses (and
therefore subnets) will receive the same configuration as stateful
ones.

File:

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

tools/gformat.py

@@ -230 +230 @@
           wlan_count += 1
         else:
-          datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifbase']
           datadump[key]['autogen_ifname'] = '_'.join(key.split('_')[1:])
           if len(key.split('_')) > 2 and key.split('_')[2].isdigit():
             datadump[key]['autogen_vlan'] = key.split('_')[2]
             datadump[key]['autogen_iface'] = '.'.join(key.split('_')[1:])
+            datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifname']
           else:
             datadump[key]['autogen_iface'] = '_'.join(key.split('_')[1:])
+            datadump[key]['autogen_if_dhcp'] = datadump[key]['autogen_ifbase']
+        print key,datadump[key]['autogen_iface'], datadump[key]['autogen_ifname'], datadump[key]['autogen_if_dhcp']
 
     except Exception as exc:
@@ -549 +551 @@
   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
+    groupif = datadump[iface_key]['autogen_if_dhcp']
     if not datadump[iface_key].has_key('comment'):
       datadump[iface_key]['comment'] = None
@@ -610 +612 @@
   # Output the blocks in groups
   for ifname,value in sorted(dhcp_out.iteritems()):
-    if len(value) > 2:
-      output += ("shared-network %s {\n" % ifname) + indent(''.join(value), 2)  + '\n}\n\n'
-    else:
-      output += ''.join(value) + "\n\n"
+      output += ("shared-network %s {\n" % ifname) + indent(''.join(value), 2).rstrip()  + '\n}\n\n'
   return output