From: Greg Price <price@mit.edu>
Date: Wed, 23 Jul 2008 05:08:38 +0000 (-0400)
Subject: but use non-misleading name in listvms
X-Git-Tag: sipb-xen-remctl-auto/1.0.20~10
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/bb817ab6a7535279e1a6432fb0be2ebfc28116ce?hp=04c466fc9094d21e3bc5dcae1f71e2877600c041

but use non-misleading name in listvms

svn path=/trunk/packages/sipb-xen-remctl-auto/; revision=716
---

diff --git a/files/usr/sbin/sipb-xen-listvms b/files/usr/sbin/sipb-xen-listvms
index 04dfc20..4daa953 100755
--- 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')
-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 = set(xsc.ls('', '/local/domain'))
     domids.discard('0')
 
     vms = dict()
@@ -24,14 +24,14 @@ def live_vms():
     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