Changeset 12479 in genesis for tools

Timestamp:

Oct 18, 2013, 8:10:20 PM (11 years ago)

Author:

rick

Message:

Correcties om graph van nodes te maken.

File:

• tools/make-network-graph.py (modified) (3 diffs)

tools/make-network-graph.py

@@ -66 +66 @@
           link_data[addr] = 1
           iface = datadump[iface_key]['autogen_ifname']
-          print nodename, iface
           INTERVAL = 60 * 10
           if store['uptime'].has_key(nodename) and store['snmp'].has_key(nodename) and store['traffic'].has_key(nodename):
@@ -77 +76 @@
               link_data[addr] = retval
 
-          print "### %s [%s] is of type %s" % (gformat.showaddr(addr), iface_key, link_type[addr])
+          print "### ... %s %s [%s] is of type %s" % (iface, gformat.showaddr(addr), iface_key, link_type[addr])
   except (KeyError, ValueError), e:
     print "[FOUT] in '%s' interface '%s'" % (host,iface_key) 
@@ -95 +94 @@
 edge [ fontsize = 10, ]
 """
-  for node, datadump in nodes.iteritems():
+  for node in sorted(nodes.keys()):
+    datadump = nodes[node]
+    print "# Processing node:", node
     lines = [node]
     for ik in datadump['autogen_iface_keys']:
+      print "# .. ", ik
       if 'alias' in ik or 'wlan' in datadump[ik]['autogen_ifname']:
         continue