Changeset 10162 in genesis for tools

Timestamp:

Mar 14, 2012, 2:13:19 PM (13 years ago)

Author:

rick

Message:

a) Fix IP assignment for wlan0.

b) fixed IP assignment for normal aliases.

File:

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

tools/gformat.py

@@ -351 +351 @@
   for iface_key in datadump['iface_keys']:
     ifacedump = datadump[iface_key]
-    interface = ifacedump['interface'].split(':')[0]
-    # By default no special interface mapping
-    iface_map[interface] = interface
+    ifname = ifacedump['autogen_ifname']
 
     # Add interface IP to list
     item = (ifacedump['ip'], ifacedump['desc'])
-    if addrs_list.has_key(interface):
-      addrs_list[interface].append(item)
+    if addrs_list.has_key(ifname):
+      addrs_list[ifname].append(item)
     else:
-      addrs_list[interface] = [item]
+      addrs_list[ifname] = [item]
 
     # Alias only needs IP assignment for now, this might change if we
@@ -402 +400 @@
   for iface,addrs in sorted(addrs_list.iteritems()):
     for addr, comment in sorted(addrs,key=lambda x: parseaddr(x[0].split('/')[0])):
-      ifacedump['iface'] = iface
       output += "# %s || %s || %s\n" % (iface, addr, comment)
-    output += "ipv4_addrs_%s='%s'\n\n" % (iface_map[iface], " ".join([x[0] for x in addrs]))
+    output += "ipv4_addrs_%s='%s'\n\n" % (iface, " ".join([x[0] for x in addrs]))
 
   return output
@@ -424 +421 @@
       wlan_count += 1
     else:
-      datadump[key]['autogen_ifname'] = datadump[key]['interface']
+      datadump[key]['autogen_ifname'] = datadump[key]['interface'].split(':')[0]
 
 
@@ -972 +969 @@
             if ssid.lower().startswith(prefix.lower()):
               datadump[iface_key]['ssid'] = prefix + ssid[len(prefix)].upper() + ssid[len(prefix) + 1:] 
+          if datadump[iface_key].has_key('ns_ip') and not datadump[iface_key].has_key('mode'):
+            datadump[iface_key]['mode'] = 'autogen-FIXME'
+          if not datadump[iface_key].has_key('desc'):
+            datadump[iface_key]['desc'] = 'autogen-FIXME'
         store_yaml(datadump)
     elif sys.argv[1] == "list":