From: Evan Broder <broder@mit.edu>
Date: Sun, 1 Jun 2008 22:57:43 +0000 (-0400)
Subject: And round 3 of using YAML
X-Git-Tag: sipb-xen-remote-server/0.2~24
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/c6f3577d4ad01e99b50af6b68d2399b35e0ea4cd

And round 3 of using YAML

svn path=/trunk/packages/sipb-xen-remote-server/; revision=552
---

diff --git a/files/usr/sbin/sipb-xen-remote-listvms b/files/usr/sbin/sipb-xen-remote-listvms
index 8b47167..f9b3f36 100755
--- a/files/usr/sbin/sipb-xen-remote-listvms
+++ b/files/usr/sbin/sipb-xen-remote-listvms
@@ -8,72 +8,7 @@ suite.
 from itertools import chain
 from subprocess import CalledProcessError, PIPE, Popen
 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
+from yaml import safe_dump, safe_load
 
 ###
 
@@ -90,23 +25,18 @@ def run(cmd):
 
 def main(argv):
   # Query each of the server for their VMs.
-  # run('kinit -k host/sipb-vm-58.mit.edu'.split())
   # 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
-  results = [ loads(run(['remctl', server, 'remote', 'web', 'listvms', '--pickle']))
+  results = [ safe_load(run(['remctl', server, 'remote', 'web', 'listvms']))
               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)
-  if argv[1:] == ['--pickle']:
-    dump(merged, stdout)
-  else:
-    print merged
-    print '.'
+  print safe_dump(merged, default_flow_style=False)
 
 if __name__ == '__main__':
   main(argv)