Whoops - I should actually check code after I write it; fix the new RemConfFS

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

-from subprocess import PIPE, Popen
-try:
-    from subprocess import CalledProcessError
-except ImportError:
-    # Python 2.4 doesn't implement CalledProcessError
-    class CalledProcessError(Exception):
-        """This exception is raised when a process run by check_call() returns
-        a non-zero exit status. The exit status will be stored in the
-        returncode attribute."""
-        def __init__(self, returncode, cmd):
-            self.returncode = returncode
-            self.cmd = cmd
-        def __str__(self):
-            return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
+from invirt.remote import bcast

 import sys
 import yaml
 
 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 = [yaml.load(o, yaml.CSafeLoader) 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 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=2:ts=4
+# vim:et:sw=4:ts=4