Changeset 8332 in genesis

Timestamp:

Aug 12, 2010, 9:50:46 PM (14 years ago)

Author:

rick

Message:

• SNMP got not forced

• IP valid checking was not going for the right IPS

Location:

nodes

Files:

• get-network-status.py (modified) (5 diffs)
• gformat.py (modified) (1 diff)

nodes/get-network-status.py

@@ -131 +131 @@
 
 
-def do_snmp_scan(iphosts, status, stored_status=dict()):
+def do_snmp_scan(iphosts, status, stored_status=dict(), forced_scan=False):
   """ SNMP scanning, based on results fould in NMAP scan"""
   mac_to_host = dict()
@@ -156 +156 @@
     status[host]['iface'] = dict()
     try:
-      if stored_status[host]['snmp_retval'] != 0:
+      if not forced_scan and stored_status[host]['snmp_retval'] != 0:
         print "## SNMP Connect failed last time, ignoring"
         continue
@@ -231 +231 @@
       print "## Arp table MAC %s -> %s %s" % (ip, mac, local)
   
-    # Make sure we keep a record of the processed host
-    host_processed[hostname] = status[host]
+    # Make sure we keep a record of the processed host which ip entry to check
+    host_processed[hostname] = host
 
   stored_status['host_processed'] = host_processed
@@ -282 +282 @@
 
   # Correlation mapping
-  for fqdn, details in host_processed.iteritems():
+  for fqdn, ip in host_processed.iteritems():
+    details = status[ip]
     nodemap['node'][fqdn] = gformat.OK
     print "# Working on %s" % fqdn
@@ -386 +387 @@
   # Do SNMP discovery
   if opt_snmp_scan:
-    snmp_status = do_snmp_scan(iplist, nmap_status, stored_status)
+    snmp_status = do_snmp_scan(iplist, nmap_status, stored_status, opt_force_snmp)
   else:
     snmp_status = stored_status

nodes/gformat.py

@@ -312 +312 @@
         addr, mask = l.split('/')
         # Special case do not process
-        if not valid_addr(addr):
-           ip_list.append(addr)
+        if valid_addr(addr):
+          ip_list.append(addr)
+        else:
+          print "## IP '%s' in '%s' not valid" % (addr, config['nodename'])
     return sorted(ip_list)