Changeset 11729 in genesis

Timestamp:

Feb 13, 2013, 8:13:25 PM (12 years ago)

Author:

rick

Message:

• Less logging
• extra ID for model
• fqdn connect by default

File:

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

tools/check-batch-cmd

@@ -15 +15 @@
 import sys
 import time
+import logging
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+logging.getLogger("paramiko").setLevel(logging.WARNING)
 
 SSHPASS = None
@@ -54 +59 @@
   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']))
+    ['.1.2.840.10036.3.1.2.1.3.5', '.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=1)
@@ -100 +105 @@
   try:
     wl_release = subprocess.check_output(['snmpget', '-Oq', '-Ov',  '-c', 'public', '-v2c',
-      host, 'UCD-SNMP-MIB::ucdavis.84.4.1.2.6.119.108.45.118.101.114.1'])
+      datadump['autogen_fqdn'], 'UCD-SNMP-MIB::ucdavis.84.4.1.2.6.119.108.45.118.101.114.1'])
     datadump['wl_release'] = int(wl_release.replace('"',''))
   except subprocess.CalledProcessError, ValueError: