Changeset 9808 in genesis for tools

Timestamp:

Dec 20, 2011, 7:50:15 PM (13 years ago)

Author:

rick

Message:

Extra comments is proven usefull when debugging for errors...

File:

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

tools/gformat.py

@@ -280 +280 @@
   # - masterip is special as it needs to be assigned to at
   #   least one interface, so if not used assign to lo0
-  addrs_list = { 'lo0' : ["127.0.0.1/8", "172.31.255.1/32"] }
+  addrs_list = { 'lo0' : [("127.0.0.1/8", "LocalHost"), ("172.31.255.1/32","Proxy IP")] }
   iface_map = {'lo0' : 'lo0'}
 
@@ -299 +299 @@
 
     # Add interface IP to list
+    item = (ifacedump['ip'], ifacedump['desc'])
     if addrs_list.has_key(interface):
-      addrs_list[interface].append(ifacedump['ip'])
+      addrs_list[interface].append(item)
     else:
-      addrs_list[interface] = [ifacedump['ip']]
+      addrs_list[interface] = [item]
 
     # Alias only needs IP assignment for now, this might change if we
@@ -348 +349 @@
   output += "\n"
   for iface,addrs in sorted(addrs_list.iteritems()):
-    output += "ipv4_addrs_%s='%s'\n" % (iface_map[iface], " ".join(addrs))
+    for addr,comment in addrs:
+      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]))
 
   return output