but use non-misleading name in listvms

[invirt/packages/invirt-remote.git] / files / usr / sbin / sipb-xen-listvms

diff --git a/files/usr/sbin/sipb-xen-listvms b/files/usr/sbin/sipb-xen-listvms
index 7884d87..4daa953 100755 (executable)
--- a/files/usr/sbin/sipb-xen-listvms
+++ b/files/usr/sbin/sipb-xen-listvms
@@ -1,40 +1,49 @@
 #!/usr/bin/python
 
 import sys
+import time
 sys.path.insert(0, '/usr/lib/xen-3.1-1/lib/python')
-from xen.lowlevel.xs import xs
+from xen.lowlevel import xs
 
-trans = xs()
+xsc = xs.xs()
 
 def live_vms():
-    domids = set(trans.ls('', '/local/domain'))
-    domids.remove('0')
+    domids = set(xsc.ls('', '/local/domain'))
+    domids.discard('0')
 
     vms = dict()
 
     for domid in domids:
-        name, data = get_dom(int(domid))
+        try:
+            name, data = get_dom(int(domid))
+        except TypeError:
+            continue # went down since we started
         if name.startswith('d_'):
             name = name[2:]
             vms[name] = data
     return vms
 
 def get_dom(domid):
-    name = trans.read('', '/local/domain/%d/name' % domid)
+    name = xsc.read('', '/local/domain/%d/name' % domid)
     data = dict()
     data['domid'] = domid
     # presence of a graphical console
-    data['console'] = trans.read('', '/local/domain/%d/device/vfb/0/state' % domid)
+    data['console'] = xsc.read('', '/local/domain/%d/device/vfb/0/state' % domid)
     # uptime
-    data['vm'] = trans.read('', '/local/domain/%d/vm' % domid)
-    data['start_time'] = float(trans.read('', '%s/start_time' % data['vm']))
+    data['vm'] = xsc.read('', '/local/domain/%d/vm' % domid)
+    data['start_time'] = float(xsc.read('', '%s/start_time' % data['vm']))
+    data['uptime'] = time.time()-data['start_time']
     
     return name, data
 
 if __name__ == '__main__':
     vms = live_vms()
-    if '--pickle' in sys.argv[1:]:
+    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.dump(vms, sys.stdout, cPickle.HIGHEST_PROTOCOL)
     else:
-        print vms
+        import yaml
+        print yaml.dump(vms, Dumper=yaml.CSafeDumper, default_flow_style=False)