Changeset 553 for trunk

Timestamp:

Jun 1, 2008, 11:53:12 PM (16 years ago)

Author:

quentin

Message:

Support YAML (default), JSON, and Pickle formats, depending on the client's choice

Location:

trunk/packages/sipb-xen-remctl-auto

Files:

• debian/control.in (modified) (1 diff)
• files/usr/sbin/sipb-xen-listvms (modified) (2 diffs)

trunk/packages/sipb-xen-remctl-auto/debian/control.in

@@ -8 +8 @@
 Package: sipb-xen-remctl-auto
 Architecture: all
-Depends: ${misc:Depends}, remctl-server, sipb-xen-console-server
+Depends: ${misc:Depends}, remctl-server, sipb-xen-console-server, python-cjson, python-yaml
 Description: Installs the SIPB Xen automatic remctl management system
  This is our automatic remctl configuration management system.

trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-listvms

@@ -5 +5 @@
 sys.path.insert(0, '/usr/lib/xen-3.1-1/lib/python')
 from xen.lowlevel.xs import xs
-import yaml
 
 trans = xs()
@@ -37 +36 @@
 if __name__ == '__main__':
     vms = live_vms()
-    print yaml.safe_dump(vms, default_flow_style=False)
+    if '--json' in sys.argv[1:]:
+        import cjson
+        print cjson.encode(vms)
+    elif '--pickle' in sys.argv[1:]:
+        import cPickle
+        cPickle.dump(vms, sys.stdout, cPickle.HIGHEST_PROTOCOL)
+    else:
+        import yaml
+        print yaml.safe_dump(vms, default_flow_style=False)