Changeset 12479 in genesis

Timestamp:

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

Author:

rick

Message:

Correcties om graph van nodes te maken.

Files:

• nodes/HybridDrijfhuis/wleiden.yaml (modified) (2 diffs)
• nodes/HybridHuub/wleiden.yaml (modified) (2 diffs)
• nodes/HybridRustdam/wleiden.yaml (modified) (1 diff)
• nodes/HybridUniGor2/wleiden.yaml (modified) (2 diffs)
• tools/make-network-graph.py (modified) (3 diffs)

nodes/HybridDrijfhuis/wleiden.yaml

@@ -56 +56 @@
   mode       : "ap"
   type       : "eth"
+  extra_type : "eth2wifibridge"
   channel    : "1"
   ssid       : "ap-westeinder-drijfhuis-3"
@@ -61 +62 @@
   ns_ip      : "172.17.0.194/26"
   ns_mac     : ""
+  bridge_type: "Bullet2"
   status     : "down"
 

nodes/HybridHuub/wleiden.yaml

@@ -42 +42 @@
   mode       : "ap"
   type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "ap-WirelessLeiden-Huub2"
   dhcp       : "140-180"
   ns_ip      : "172.17.16.130/26"
@@ -55 +57 @@
   mode       : "ap"
   type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "ap-WirelessLeiden-Huub3"
   dhcp       : "10-250"
   ns_ip      : "172.17.65.2/24"

nodes/HybridRustdam/wleiden.yaml

@@ -47 +47 @@
   mode       : "ap-wds"
   type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-o.rustdam.wleiden.net"
   dhcp       : False
   compass    : "z"

nodes/HybridUniGor2/wleiden.yaml

@@ -49 +49 @@
   mode       : "ap-wds"
   type       : "eth"
+  extra_type : "eth2wifibridge"
   channel    : "7"
   ssid       : "n-o.unigor.wleiden.net"
@@ -55 +56 @@
   ns_ip      : "172.16.16.130/29"
   ns_mac     : "00:15:6d:e8:e6:9b"
+  bridge_type: "NanoStation M5"
   status     : "down"
 

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