Expose an interface to the autoinstaller over remctl and validate options

[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 6690fb9..8c25d09 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote-listvms
+++ b/files/usr/sbin/sipb-xen-remote-listvms
@@ -5,26 +5,13 @@ Collates the results of listvms from multiple VM servers.  Part of the xvm
 suite.
 """
 
 suite.
 """
 

-from subprocess import PIPE, Popen
+from invirt.remote import bcast

 import sys
 import yaml
 
 def main(argv):
 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
-    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)
+    # 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 = {}

@@ -36,6 +23,6 @@ def main(argv):
     print yaml.dump(merged, Dumper=yaml.CSafeDumper, default_flow_style=False)
 
 if __name__ == '__main__':
     print yaml.dump(merged, Dumper=yaml.CSafeDumper, default_flow_style=False)
 
 if __name__ == '__main__':

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

 
 # vim:et:sw=4:ts=4
 
 # vim:et:sw=4:ts=4