- use invirt.config to get hostnames

[invirt/packages/invirt-remote.git] / 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 eaefffd..8c25d09 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote-listvms
+++ b/files/usr/sbin/sipb-xen-remote-listvms
@@ -1,39 +1,28 @@
-#!/usr/bin/env python2.5
+#!/usr/bin/python

 
 """
 Collates the results of listvms from multiple VM servers.  Part of the xvm
 suite.
 """
 
 
 """
 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
-
-###
+from invirt.remote import bcast
+import sys
+import yaml

 
 def main(argv):
 
 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
-    pipes = [Popen(['remctl', server, 'remote', 'web', 'listvms'], stdout=PIPE)
-             for server in servers]
-    outputs = [p.communicate()[0] for p in pipes]
-    for p in pipes:
-        if p.returncode != 0:
-            raise CalledProcessError(p.returncode, cmd)
-    results = [safe_load(o) for o in outputs]
-    results = filter(lambda x: x is not None, results)
+    # Query each of the hosts.
+    results = filter(lambda (_, x): x is not None, bcast('listvms'))

 
     # Merge the results and print.
     merged = {}
 
     # Merge the results and print.
     merged = {}

-    for result in results:
+    for server, result in results:
+        for data in result.itervalues():
+            data['host'] = server

         merged.update(result)
         merged.update(result)

-    print safe_dump(merged, default_flow_style=False)
+
+    print yaml.dump(merged, Dumper=yaml.CSafeDumper, default_flow_style=False)

 
 if __name__ == '__main__':
 
 if __name__ == '__main__':

-    main(argv)
+    sys.exit(main(sys.argv))

 
 

-# vim:et:sw=2:ts=4
+# vim:et:sw=4:ts=4