Fix sipb-xen-vmcontrol to know about the new magic error code

[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 a38c9ae..79762fa 100755 (executable)
--- a/files/usr/sbin/sipb-xen-listvms
+++ b/files/usr/sbin/sipb-xen-listvms
@@ -3,12 +3,12 @@
 import sys
 import time
 sys.path.insert(0, '/usr/lib/xen-3.1-1/lib/python')
 import sys
 import time
 sys.path.insert(0, '/usr/lib/xen-3.1-1/lib/python')

-from xen.xend.xenstore import xstransact
+from xen.lowlevel import xs

 
 

-xst = xstransact.xstransact()
+xsc = xs.xs()

 
 def live_vms():
 
 def live_vms():

-    domids = set(xst.List('/local/domain'))
+    domids = set(xsc.ls('', '/local/domain'))

     domids.discard('0')
 
     vms = dict()
     domids.discard('0')
 
     vms = dict()

@@ -16,7 +16,7 @@ def live_vms():
     for domid in domids:
         try:
             name, data = get_dom(int(domid))
     for domid in domids:
         try:
             name, data = get_dom(int(domid))

-        except TypeError:
+        except (xs.Error, TypeError):

             continue # went down since we started
         if name.startswith('d_'):
             name = name[2:]
             continue # went down since we started
         if name.startswith('d_'):
             name = name[2:]

@@ -24,14 +24,14 @@ def live_vms():
     return vms
 
 def get_dom(domid):
     return vms
 
 def get_dom(domid):

-    name = xst.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 = dict()
     data['domid'] = domid
     # presence of a graphical console

-    data['console'] = xst.Read('/local/domain/%d/device/vfb/0/state' % domid)
+    data['console'] = xsc.read('', '/local/domain/%d/device/vfb/0/state' % domid)

     # uptime
     # uptime

-    data['vm'] = xst.Read('/local/domain/%d/vm' % domid)
-    data['start_time'] = float(xst.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
     data['uptime'] = time.time()-data['start_time']
     
     return name, data