X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/c6f3577d4ad01e99b50af6b68d2399b35e0ea4cd..1b987a7debd0f192b696c4befb607293b20560ab:/files/usr/sbin/sipb-xen-remote-listvms

diff --git a/files/usr/sbin/sipb-xen-remote-listvms b/files/usr/sbin/sipb-xen-remote-listvms
index f9b3f36..6690fb9 100755
--- a/files/usr/sbin/sipb-xen-remote-listvms
+++ b/files/usr/sbin/sipb-xen-remote-listvms
@@ -1,44 +1,41 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/python
 
 """
 Collates the results of listvms from multiple VM servers.  Part of the xvm
 suite.
 """
 
-from itertools import chain
-from subprocess import CalledProcessError, PIPE, Popen
-from sys import argv, stdout
-from yaml import safe_dump, safe_load
-
-###
-
-def run(cmd):
-  """
-  Run the given command (a list of program and argument strings) and return the
-  stdout as a string, raising a CalledProcessError if the program exited with a
-  non-zero status.
-  """
-  p = Popen(cmd, stdout=PIPE)
-  stdout = p.communicate()[0]
-  if p.returncode != 0: raise CalledProcessError(p.returncode, cmd)
-  return stdout
+from subprocess import PIPE, Popen
+import sys
+import yaml
 
 def main(argv):
-  # Query each of the server for their VMs.
-  # TODO get `servers` from a real list of all the VM hosts (instead of
-  # hardcoding the list here)
-  servers = [ 'black-mesa.mit.edu', 'sx-blade-2.mit.edu' ]
-  # XXX
-  results = [ safe_load(run(['remctl', server, 'remote', 'web', 'listvms']))
-              for server in servers ]
-  results = filter( lambda x: x is not None, results )
-
-  # Merge the results and print.
-  merged = {}
-  for result in results: merged.update(result)
-  print safe_dump(merged, default_flow_style=False)
+    # Query each of the server for their VMs.
+    # TODO get `servers` from a real list of all the VM hosts (instead of
+    # hardcoding the list here)
+    servers = ['black-mesa.mit.edu', 'sx-blade-2.mit.edu']
+    # XXX
+    pipes = [(server,
+              Popen(['remctl', server, 'remote', 'web', 'listvms'], stdout=PIPE))
+             for server in servers]
+    outputs = [(s, p.communicate()[0]) for (s, p) in pipes]
+    for (s, p) in pipes:
+        if p.returncode != 0:
+            raise RuntimeError("remctl to host %s returned non-zero exit status %d"
+                               % (s, p.returncode)) 
+    results = [(s, yaml.load(o, yaml.CSafeLoader)) for (s, o) in outputs]
+    results = filter(lambda (_, x): x is not None, results)
+
+    # Merge the results and print.
+    merged = {}
+    for server, result in results:
+        for data in result.itervalues():
+            data['host'] = server
+        merged.update(result)
+
+    print yaml.dump(merged, Dumper=yaml.CSafeDumper, default_flow_style=False)
 
 if __name__ == '__main__':
-  main(argv)
+    main(sys.argv)
 
-# vim:et:sw=2:ts=2
+# vim:et:sw=4:ts=4