Changeset 549 for trunk

Timestamp:

Jun 1, 2008, 5:33:57 PM (16 years ago)

Author:

y_z

Message:

before migrating to yaml; things seem to be working, --pickle supported

Location:

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

Files:

• sipb-xen-remote-listvms (modified) (3 diffs)
• sipb-xen-remote-proxy (modified) (1 diff)

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

@@ -8 +8 @@
 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
 
 ###
@@ -95 +96 @@
   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 )
@@ -102 +103 @@
   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__':

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

@@ -1 +1 @@
 #!/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