From 1b987a7debd0f192b696c4befb607293b20560ab Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sat, 21 Jun 2008 19:56:50 -0400 Subject: [PATCH] note host in listvms svn path=/trunk/packages/sipb-xen-remote-server/; revision=623 --- files/usr/sbin/sipb-xen-remote-listvms | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/files/usr/sbin/sipb-xen-remote-listvms b/files/usr/sbin/sipb-xen-remote-listvms index 81722e9..6690fb9 100755 --- a/files/usr/sbin/sipb-xen-remote-listvms +++ b/files/usr/sbin/sipb-xen-remote-listvms @@ -9,27 +9,28 @@ 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 - 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) print yaml.dump(merged, Dumper=yaml.CSafeDumper, default_flow_style=False) -- 1.7.9.5