Changeset 8328 in genesis for nodes/get-network-status.py

Timestamp:

Aug 12, 2010, 9:07:52 PM (14 years ago)

Author:

rick

Message:

Argument and 'flow' fixes

File:

• nodes/get-network-status.py (modified) (5 diffs)

nodes/get-network-status.py

@@ -90 +90 @@
 
 
-def do_nmap_scan(command, iphosts, result_file=None):
+def do_nmap_scan(command, iphosts, result_file=None, forced_scan=False):
   """ Wrapper around _run_nmap to get listing of all hosts, the default nmap
       does not return results for failed hosts"""
@@ -97 +97 @@
 
   # Return stored file if exists
-  if result_file and os.path.exists(result_file) and os.path.getsize(result_file) > 0:
+  if not forced_scan and result_file and os.path.exists(result_file)  \
+    and os.path.getsize(result_file) > 0:
     print "# Reading stored NMAP results from '%s'" % (result_file)
     status = parse_nmap(parse(result_file))
@@ -137 +138 @@
   #
   # Gather SNMP data from hosts
-  for host, scan in status.iteritems():
+  for host in iphosts:
+    # Status might be containing old hosts as well and visa-versa
+    if not status.has_key(host):
+       print "## [ERROR] No nmap result found"
+       continue
+
+    scan = status[host]
     if scan['state'] != "up":
-      continue
-    
-    # Filter set? use it
-    if iphosts and not host in iphosts:
-      print "## IP '%s' not in specified filter" % host
       continue
   
@@ -298 +300 @@
 
 def usage():
-    print "Usage: %s <all|force|stored|host HOST1 [HOST2 ...]>" % sys.argv[0]
+    print "Usage: %s <arguments>"
+    print "Arguments:"
+    print "\tall         = scan all known ips, using cached nmap"
+    print "\tnmap-only   = scan all known ips, using nmap only"
+    print "\tsnmp-only   = scan all known ips, using snmp only"
+    print "\tforce       = scan all known ips, no cache used"
+    print "\tforced-snmp = scan all known ips, no snmp cache"
+    print "\tstored      = generate status file using stored entries"
+    print "\thost <HOST1> [HOST2 ...]  = generate status file using stored entries"
+    print "\tmerge <FILE1> [FILE2 ...] = merge status file with other status files"
     sys.exit(0)
 
@@ -360 +371 @@
     if not opt_store_scan:
       nmap_result_file = None
-    nmap_status = do_nmap_scan("-p T:ssh,U:domain,T:80,T:ntp,U:snmp,T:8080 -sU -sT ",iplist, nmap_result_file)
+    nmap_status = do_nmap_scan(
+                   "-p T:ssh,U:domain,T:80,T:ntp,U:snmp,T:8080 -sU -sT ",
+                   iplist,nmap_result_file, opt_force_scan)
+
   else:
     nmap_status = stored_status['nmap_status']