Changeset 13673 in genesis for tools

Timestamp:

Dec 24, 2016, 3:06:09 PM (8 years ago)

Author:

rick

Message:

No duplicated vlan entries and stable output.

File:

• tools/gformat.py (modified) (1 diff)

tools/gformat.py

@@ -903 +903 @@
 
   (addrs_list, vlan_list, bridge_list, dhclient_if, flags_if, extra_ouput) = make_interface_list(datadump)
-  for iface, vlans in vlan_list.items():
-    output += 'vlans_%s="%s"\n' % (iface, ' '.join(vlans))
+  for iface, vlans in sorted(vlan_list.items()):
+    output += 'vlans_%s="%s"\n' % (iface, ' '.join(sorted(set(vlans))))
 
   # VLAN Parent interfaces not containing a configuration should be marked active explcitly.
-  for iface in vlan_list.keys():
+  for iface in sorted(vlan_list.keys()):
     if not iface in addrs_list.keys():
       output += "ifconfig_%s='up'\n" % iface