Changeset 10890 in genesis for tools

Timestamp:

May 16, 2012, 10:30:17 PM (13 years ago)

Author:

rick

Message:

interface: <iface>:<alias> is nu in de iface_<iface>_alias<alias>
gerepresenteerd.

Fixes beheer:ticket:221

Location:

tools

Files:

• gformat.py (modified) (9 diffs)
• make-network-graph.py (modified) (1 diff)
• make_network_kml.py (modified) (1 diff)

tools/gformat.py

@@ -147 +147 @@
     try:
       for key in datadump['autogen_iface_keys']:
+        datadump[key]['autogen_ifbase'] = key.split('_')[1]
         if datadump[key]['type'] in ['11a', '11b', '11g', 'wireless']:
           datadump[key]['autogen_ifname'] = 'wlan%i' % wlan_count
           wlan_count += 1
         else:
-          datadump[key]['autogen_ifname'] = datadump[key]['interface'].split(':')[0]
+          datadump[key]['autogen_ifname'] = datadump[key]['autogen_ifbase']
     except Exception as e:
       print "# Error while processing interface %s" % key
@@ -445 +446 @@
     if not datadump[iface_key].has_key('comment'):
       datadump[iface_key]['comment'] = None
-    dhcp_out[ifname].append("  ## %(interface)s - %(comment)s\n" % datadump[iface_key])
+    dhcp_out[ifname].append("  ## %(autogen_ifname)s - %(comment)s\n" % datadump[iface_key])
 
     (addr, mask) = datadump[iface_key]['ip'].split('/')
@@ -494 +495 @@
     if not datadump[iface_key].has_key('comment'):
       datadump[iface_key]['comment'] = None
-    output += "## %(interface)s - %(comment)s\n" % datadump[iface_key]
+    output += "## %(autogen_ifname)s - %(comment)s\n" % datadump[iface_key]
 
     if dhcp_type(datadump[iface_key]) != DHCP_SERVER:
@@ -507 +508 @@
     datadump[iface_key]['autogen_dhcp_start'] = dhcp_part + "." + dhcp_start
     datadump[iface_key]['autogen_dhcp_stop'] =  dhcp_part + "." + dhcp_stop
-    output += "dhcp-range=%(interface)s,%(autogen_dhcp_start)s,%(autogen_dhcp_stop)s,%(autogen_netmask)s,24h\n\n" % datadump[iface_key]
+    output += "dhcp-range=%(autogen_ifname)s,%(autogen_dhcp_start)s,%(autogen_dhcp_stop)s,%(autogen_netmask)s,24h\n\n" % datadump[iface_key]
 
   return output
@@ -735 +736 @@
         
 
-      output += "wlans_%(interface)s='%(autogen_ifname)s'\n" % ifacedump
+      output += "wlans_%(autogen_ifbase)s='%(autogen_ifname)s'\n" % ifacedump
       output += ("create_args_%(autogen_ifname)s='wlanmode %(autogen_wlanmode)s mode " +\
         "%(mode)s ssid %(ssid)s %(autogen_extra)s channel %(channel)s'\n") % ifacedump
@@ -923 +924 @@
     ifacedump = datadump[iface_key]
     if ifacedump.has_key('ns_ip'):
-      output += " - %(interface)s || %(mode)s || %(ns_ip)s\n" % ifacedump
+      output += " - %(autogen_ifname)s || %(mode)s || %(ns_ip)s\n" % ifacedump
 
   return output
@@ -957 +958 @@
   key_order = (
     ('comment', True),
-    ('interface', True),
     ('ip', True),
     ('desc', True),
@@ -1148 +1148 @@
     # Hacking to get proper DHCP IPs and hostnames
     for iface_key in get_interface_keys(datadump):
-      iface_name = datadump[iface_key]['interface'].replace(':',"-alias-")
+      iface_name = iface_key.replace('_','-')
       (ip, cidr) = datadump[iface_key]['ip'].split('/')
       try:
@@ -1537 +1537 @@
           for iface_key in datadump['autogen_iface_keys']:
             try:
-              if datadump[iface_key]['interface'] not in iface_key:
-                raise ValueError("interface must be in the key name")
               # All our normal wireless cards are normal APs now
               if datadump[iface_key]['type'] in ['11a', '11b', '11g', 'wireless']:

tools/make-network-graph.py

@@ -52 +52 @@
 
           link_data[addr] = 1
-          iface = datadump[iface_key]['interface']
+          iface = datadump[iface_key]['autogen_ifname']
           nodename = datadump['nodename']
           print nodename, iface

tools/make_network_kml.py

@@ -123 +123 @@
 
           link_data[addr] = 1
-          iface = datadump[iface_key]['interface']
+          iface = datadump[iface_key]['autogen_ifname']
           nodename = datadump['nodename']
           INTERVAL = 60 * 10