Changeset 8340 in genesis

Timestamp:

Aug 13, 2010, 5:38:57 PM (14 years ago)

Author:

rick

Message:

All multiple status to be merged into one big status

File:

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

nodes/get-network-status.py

@@ -19 +19 @@
 # When force is used as argument, use this range
 DEFAULT_SCAN_RANGE= ['172.16.0.0/21']
+
+# Default node status output
+nodemap_status_file = '/tmp/nodemap_status.yaml'
 
 #
@@ -254 +257 @@
 
   # Data store format used for nodemap generation
-  nodemap_status_file = '/tmp/nodemap_status.yaml'
   nodemap = { 'node' : {}, 'link' : {}}
 
@@ -305 +307 @@
   print "# Wrote nodemap status to '%s'" % nodemap_status_file
 
+
+def do_merge(files):
+  """ Merge all external statuses in our own nodestatus, using optimistic approch """
+  stream = file(nodemap_status_file,'r')
+  status = yaml.load(stream)
+  for cfile in files:
+    try:
+      print "# Merging '%s'" % cfile
+      stream = file(cfile,'r')
+      new_status = yaml.load(stream)
+      for item in ['node', 'link']:
+        for key, value in status[item].iteritems():
+          if not status[item].has_key(key):
+            # New items always welcome
+            status[item][key] = value
+            print "## [%s][%] is new (%s)" % (item, key, value) 
+          elif value < status[item][key]:
+            # Better values always welcome
+            status[item][key] = value
+            print "## [%s][%] is better (%s)" % (item, key, value) 
+    except IOError, e:
+      print "## ERROR '%s'" % e
+
+  # Save results back to file
+  stream = file(nodemap_status_file,'w')
+  yaml.dump(status, stream, default_flow_style=False)
+
 def usage():
     print "Usage: %s <arguments>"
@@ -355 +384 @@
     opt_nmap_scan = False
     opt_store_scan = False
+  elif sys.argv[1] == "merge":
+    do_merge(sys.argv[2:])
+    sys.exit(0)
   else:
     usage()