Changeset 10075 in genesis

Timestamp:

Mar 10, 2012, 1:16:22 PM (13 years ago)

Author:

rick

Message:

Whoops, time to change the password I guess..

File:

• tools/check-batch-cmd (modified) (4 diffs)

tools/check-batch-cmd

@@ -14 +14 @@
   pass
 
-try:
-  raise CmdError("rick")
-except (socket.timeout, socket.error):
-  print "### Conection failed"
-except paramiko.AuthenticationException:
-  print "### Conection failed (invalid username/password)"
-except CmdError, e: 
-  print "### Command error: %s" % e
-
 def check_host(hostname):
   cmd = "cat /etc/board.info"
@@ -28 +19 @@
   ssh = paramiko.SSHClient()
   ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-  ssh.connect(hostname, username='root', password='p2nn3nk03k',timeout=3)
+  ssh.connect(hostname, username='root', password='XXXXXXXXXX',timeout=3)
   stdin, stdout, stderr = ssh.exec_command(cmd)
   stdout = stdout.readlines()
@@ -37 +28 @@
  
   return dict(map(lambda x: x.strip().split('='),stdout))
+
+def get_bridge_type(host):
+  import netsnmp
+  netsnmp.verbose = 0
+  var_list = netsnmp.VarList(netsnmp.Varbind('.1.2.840.10036.3.1.2.1.3.6'))
+  
+  sess = netsnmp.Session(Version=1, DestHost=host, Community='public', Timeout=2 * 100000, Retries=0)
+  retval = sess.get(var_list)
+  if sess.ErrorInd < 0:
+    raise CmdError('[%(ErrorInd)s] %(ErrorStr)s' % vars(sess))
+  return retval[0]
 
 
@@ -50 +52 @@
         try:
           socket.create_connection((addr,80),2)
-          d = check_host(addr)
-          datadump[iface_key]['bridge_type'] = d['board.name']
+          bridge_type = get_bridge_type(addr)
+          datadump[iface_key]['bridge_type'] = bridge_type
         except (socket.timeout, socket.error):
           print "### Conection failed"