From: Eric Price Date: Mon, 2 Jun 2008 07:40:51 +0000 (-0400) Subject: Style adjustments (4-space indentation, no spaces inside parens). X-Git-Tag: sipb-xen-remote-server/0.2~22 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/2d49fbcca4c124edaac15128f1a13268346328f6?ds=sidebyside Style adjustments (4-space indentation, no spaces inside parens). svn path=/trunk/packages/sipb-xen-remote-server/; revision=561 --- diff --git a/files/usr/sbin/sipb-xen-remote-listvms b/files/usr/sbin/sipb-xen-remote-listvms index 172ca17..eaefffd 100755 --- a/files/usr/sbin/sipb-xen-remote-listvms +++ b/files/usr/sbin/sipb-xen-remote-listvms @@ -13,25 +13,27 @@ from yaml import safe_dump, safe_load ### 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 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) - # Merge the results and print. - merged = {} - for result in results: merged.update(result) - print safe_dump(merged, default_flow_style=False) + # Merge the results and print. + merged = {} + for result in results: + merged.update(result) + print safe_dump(merged, default_flow_style=False) if __name__ == '__main__': - main(argv) + main(argv) -# vim:et:sw=2:ts=2 +# vim:et:sw=2:ts=4