Changeset 10892 in genesis for tools

Timestamp:

May 16, 2012, 10:49:54 PM (13 years ago)

Author:

rick

Message:

Doe een import van de bridge unit dmv een scan.

Location:

tools

Files:

• check-batch-cmd (modified) (2 diffs)
• gformat.py (modified) (1 diff)

tools/check-batch-cmd

@@ -18 +18 @@
 import pysnmp
 from pysnmp.entity.rfc3413.oneliner import cmdgen
+import netsnmp
 
 def snmp_test():
@@ -109 +110 @@
     elif line.startswith('Elan-mmcr'):
       datadump['board'] = 'net45xx'
-  #for iface_key in datadump['autogen_iface_keys']:
-  #  ifacedump = datadump[iface_key]
-  #  if ifacedump.has_key('ns_ip') and ifacedump['ns_ip']:
-  #    addr = ifacedump['ns_ip'].split('/')[0]
-  #    print "## Bridge IP: %(ns_ip)s at %(interface)s" % ifacedump
-  #    try:
-  #      socket.create_connection((addr,80),2)
-  #      bridge_type = get_bridge_type(addr)
-  #      datadump[iface_key]['bridge_type'] = bridge_type
-  #    except (socket.timeout, socket.error) as e:
-  #      print "### %s (%s)" % (e, addr)
-  #    except paramiko.AuthenticationException:
-  #      print "### Conection failed (invalid username/password)"
-  #    except CmdError, e: 
-  #      print "### Command error: %s" % e
+  for iface_key in datadump['autogen_iface_keys']:
+    ifacedump = datadump[iface_key]
+    if ifacedump.has_key('ns_ip') and ifacedump['ns_ip']:
+      addr = ifacedump['ns_ip'].split('/')[0]
+      print "## Bridge IP: %(ns_ip)s at %(autogen_ifname)s" % ifacedump
+      try:
+        socket.create_connection((addr,80),2)
+        bridge_type = get_bridge_type(addr)
+        datadump[iface_key]['bridge_type'] = bridge_type
+      except (socket.timeout, socket.error) as e:
+        print "### %s (%s)" % (e, addr)
+      except paramiko.AuthenticationException:
+        print "### Conection failed (invalid username/password)"
+      except CmdError, e: 
+        print "### Command error: %s" % e
   gformat.store_yaml(datadump)
 

tools/gformat.py

@@ -973 +973 @@
     ('ns_mac', False),
     ('bullet2_mac', False),
-    ('ns_ssid', False),
     ('ns_type', False),
+    ('bridge_type', False),
     ('status', True),
   )