Index: /tools/make-network-graph.py
===================================================================
--- /tools/make-network-graph.py	(revision 9988)
+++ /tools/make-network-graph.py	(revision 9989)
@@ -11,10 +11,14 @@
 import sys
 import tempfile
+import yaml
 
 OUTFILE = os.path.join(os.getcwd(),'network.png')
+
+store = yaml.load(open('store.yaml','r'))
 
 def make_graph():
   poel = {}
   link_type = {}
+  link_data = {}
   try:
     for host in gformat.get_hostlist():
@@ -37,9 +41,24 @@
         else: 
           poel[addr] = [host]
-          # Assume all eth2wifibridge to be 11a for a moment
-          if datadump[iface_key].has_key('eth2wifibridge'):
+          # Assume all ns_ip to be 11a for a moment
+          if datadump[iface_key].has_key('ns_ip'):
             link_type[addr] = '11a'
           else:
             link_type[addr] = datadump[iface_key]['type']
+
+          link_data[addr] = 1
+          iface = datadump[iface_key]['interface']
+          nodename = datadump['nodename']
+          print nodename, iface
+          INTERVAL = 60 * 10
+          if store['uptime'].has_key(nodename) and store['snmp'].has_key(nodename) and store['traffic'].has_key(nodename):
+            if store['traffic'][nodename].has_key(iface):
+              (b_in, b_out) = store['traffic'][nodename][iface]
+              uptime = store['uptime'][nodename]
+              t_kb = float(b_in + b_out) / 1024
+              print "# INFO: Found %s kB in %s seconds" % (t_kb, INTERVAL)
+              retval = ((t_kb) / uptime) * INTERVAL
+              link_data[addr] = retval
+
           print "### %s [%s] is of type %s" % (gformat.showaddr(addr), iface_key, link_type[addr])
   except (KeyError, ValueError), e:
@@ -48,5 +67,6 @@
     sys.exit(1)
 
-  f = tempfile.NamedTemporaryFile(bufsize=0)
+  #f = tempfile.NamedTemporaryFile(bufsize=0)
+  f = open('/tmp/test.dot','w')
   sys.stderr.write("# Building temponary graph file\n")
   print >> f, "Graph WirelessLeidenNetwork {"
@@ -59,5 +79,5 @@
   for addr,leden in poel.iteritems():
     if link_type[addr] == '11a':
-      color = 'red'
+      color = 'green'
       weight = 4
     elif link_type[addr] == 'eth':
@@ -67,9 +87,11 @@
       color = 'black'
       weight = 1
+    width = max(1,link_data[addr])
     leden = sorted(set(leden))
     for index,lid in enumerate(leden[:-1]):
       for buur in leden[index + 1:]:
-        print >> f,'  %s -- %s [label="%s", color="%s", weight="%s"]' % (lid, buur, gformat.showaddr(addr), color, weight)
+        print >> f,'  %s -- %s [label="%s", color="%s", weight="%s", style="setlinewidth(%s)"]' % (lid, buur, gformat.showaddr(addr), color, weight, width)
   print >> f, "}"
+  f.flush()
   sys.stderr.write("# Plotting temponary graph file using graphviz\n")
   retval = subprocess.call(["neato","-Tpng",f.name, "-o", OUTFILE])