Index: tools/check-batch-cmd
===================================================================
--- tools/check-batch-cmd	(revision 10079)
+++ tools/check-batch-cmd	(revision 10081)
@@ -7,7 +7,10 @@
 #
 import gformat
+import netsnmp
+import paramiko
+import socket
 import sys
-import socket
-import paramiko
+
+netsnmp.verbose = 0
 
 class CmdError(Exception):
@@ -30,7 +33,8 @@
 
 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'))
+  """ Both NS and NS Mx uses a slighly different OID"""
+  var_list = netsnmp.VarList(
+   *map(lambda x: netsnmp.Varbind(x), 
+    ['.1.2.840.10036.3.1.2.1.3.6', '.1.2.840.10036.3.1.2.1.3.7']))
   
   sess = netsnmp.Session(Version=1, DestHost=host, Community='public', Timeout=2 * 100000, Retries=0)
@@ -38,5 +42,5 @@
   if sess.ErrorInd < 0:
     raise CmdError('[%(ErrorInd)s] %(ErrorStr)s' % vars(sess))
-  return retval[0]
+  return filter(None, retval)[0]
 
 
@@ -66,4 +70,5 @@
   if sys.argv[1:]:
     for host in sys.argv[1:]:
-      check_host(host)
-  main()
+      print get_bridge_type(host)
+  else:
+    main()