Changeset 623

Timestamp:

Jun 21, 2008, 7:56:50 PM (16 years ago)

Author:

price

Message:

note host in listvms

File:

• trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvms (modified) (2 diffs)

trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvms

@@ -10 +10 @@
 import yaml
 
-###
-
 def main(argv):
     # Query each of the server for their VMs.
@@ -18 +16 @@
     servers = ['black-mesa.mit.edu', 'sx-blade-2.mit.edu']
     # XXX
-    pipes = [Popen(['remctl', server, 'remote', 'web', 'listvms'], stdout=PIPE)
+    pipes = [(server,
+              Popen(['remctl', server, 'remote', 'web', 'listvms'], stdout=PIPE))
              for server in servers]
-    outputs = [p.communicate()[0] for p in pipes]
-    for p in pipes:
+    outputs = [(s, p.communicate()[0]) for (s, p) in pipes]
+    for (s, p) in pipes:
         if p.returncode != 0:
-            raise RuntimeError("Command '%s' returned non-zero exit status %d"
-                               % ('remctl', p.returncode)) 
-    results = [yaml.load(o, yaml.CSafeLoader) for o in outputs]
-    results = filter(lambda x: x is not None, results)
+            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 result in results:
+    for server, result in results:
+        for data in result.itervalues():
+            data['host'] = server
         merged.update(result)