From: Yang Zhang Date: Sun, 1 Jun 2008 21:33:57 +0000 (-0400) Subject: before migrating to yaml; things seem to be working, --pickle supported X-Git-Tag: sipb-xen-remote-server/0.2~25 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/d9d238b8ee37ac47081374c4c658fe959780fdfe?ds=inline before migrating to yaml; things seem to be working, --pickle supported svn path=/trunk/packages/sipb-xen-remote-server/; revision=549 --- diff --git a/files/usr/sbin/sipb-xen-remote-listvms b/files/usr/sbin/sipb-xen-remote-listvms index 4f16a98..8b47167 100755 --- a/files/usr/sbin/sipb-xen-remote-listvms +++ b/files/usr/sbin/sipb-xen-remote-listvms @@ -7,72 +7,73 @@ suite. from itertools import chain from subprocess import CalledProcessError, PIPE, Popen -from sys import argv +from sys import argv, stdout +from cPickle import dump, loads ### -import compiler - -class Unsafe_Source_Error(Exception): - def __init__(self,error,descr = None,node = None): - self.error = error - self.descr = descr - self.node = node - self.lineno = getattr(node,"lineno",None) - - def __repr__(self): - return "Line %d. %s: %s" % (self.lineno, self.error, self.descr) - __str__ = __repr__ - -class SafeEval(object): - - def visit(self, node,**kw): - cls = node.__class__ - meth = getattr(self,'visit'+cls.__name__,self.default) - return meth(node, **kw) - - def default(self, node, **kw): - for child in node.getChildNodes(): - return self.visit(child, **kw) - - visitExpression = default - - def visitConst(self, node, **kw): - return node.value - - def visitDict(self,node,**kw): - return dict([(self.visit(k),self.visit(v)) for k,v in node.items]) - - def visitTuple(self,node, **kw): - return tuple(self.visit(i) for i in node.nodes) - - def visitList(self,node, **kw): - return [self.visit(i) for i in node.nodes] - -class SafeEvalWithErrors(SafeEval): - - def default(self, node, **kw): - raise Unsafe_Source_Error("Unsupported source construct", - node.__class__,node) - - def visitName(self,node, **kw): - if node.name == 'None': return None - raise Unsafe_Source_Error("Strings must be quoted", - node.name, node) - - # Add more specific errors if desired - -def safe_eval(source, fail_on_error = True): - if source.strip() == '': return None - walker = fail_on_error and SafeEvalWithErrors() or SafeEval() - try: - ast = compiler.parse(source,"eval") - except SyntaxError, err: - raise - try: - return walker.visit(ast) - except Unsafe_Source_Error, err: - raise +#import compiler +# +#class Unsafe_Source_Error(Exception): +# def __init__(self,error,descr = None,node = None): +# self.error = error +# self.descr = descr +# self.node = node +# self.lineno = getattr(node,"lineno",None) +# +# def __repr__(self): +# return "Line %d. %s: %s" % (self.lineno, self.error, self.descr) +# __str__ = __repr__ +# +#class SafeEval(object): +# +# def visit(self, node,**kw): +# cls = node.__class__ +# meth = getattr(self,'visit'+cls.__name__,self.default) +# return meth(node, **kw) +# +# def default(self, node, **kw): +# for child in node.getChildNodes(): +# return self.visit(child, **kw) +# +# visitExpression = default +# +# def visitConst(self, node, **kw): +# return node.value +# +# def visitDict(self,node,**kw): +# return dict([(self.visit(k),self.visit(v)) for k,v in node.items]) +# +# def visitTuple(self,node, **kw): +# return tuple(self.visit(i) for i in node.nodes) +# +# def visitList(self,node, **kw): +# return [self.visit(i) for i in node.nodes] +# +#class SafeEvalWithErrors(SafeEval): +# +# def default(self, node, **kw): +# raise Unsafe_Source_Error("Unsupported source construct", +# node.__class__,node) +# +# def visitName(self,node, **kw): +# if node.name == 'None': return None +# raise Unsafe_Source_Error("Strings must be quoted", +# node.name, node) +# +# # Add more specific errors if desired +# +#def safe_eval(source, fail_on_error = True): +# if source.strip() == '': return None +# walker = fail_on_error and SafeEvalWithErrors() or SafeEval() +# try: +# ast = compiler.parse(source,"eval") +# except SyntaxError, err: +# raise +# try: +# return walker.visit(ast) +# except Unsafe_Source_Error, err: +# raise ### @@ -94,15 +95,18 @@ def main(argv): # hardcoding the list here) servers = [ 'black-mesa.mit.edu', 'sx-blade-2.mit.edu' ] # XXX - results = [ safe_eval(run(['remctl', server, 'remote', 'web', 'listvms'] + argv[1:])) + results = [ loads(run(['remctl', server, 'remote', 'web', 'listvms', '--pickle'])) for server in servers ] results = filter( lambda x: x is not None, results ) # Merge the results and print. merged = {} for result in results: merged.update(result) - print merged - print '.' + if argv[1:] == ['--pickle']: + dump(merged, stdout) + else: + print merged + print '.' if __name__ == '__main__': main(argv) diff --git a/files/usr/sbin/sipb-xen-remote-proxy b/files/usr/sbin/sipb-xen-remote-proxy index 4a1364e..2b62ca9 100755 --- a/files/usr/sbin/sipb-xen-remote-proxy +++ b/files/usr/sbin/sipb-xen-remote-proxy @@ -1,5 +1,12 @@ #!/bin/sh # invoke as sipb-xen-remote-proxy-$TYPE, with "TYPE" in the remctl sense. -kinit -k host/sipb-vm-58.mit.edu +klist -s || kinit -k host/remote.mit.edu #echo remctl black-mesa remote ${0##*-} "$@" -remctl black-mesa remote ${0##*-} "$@" +if false ; then + remctl black-mesa remote ${0##*-} "$@" +else + case "$1" in + listvms ) shift; sipb-xen-remote-listvms "$@" ;; + * ) remctl black-mesa remote ${0##*-} "$@" ;; + esac +fi