Changeset 535 for trunk/packages/sipb-xen-www/code/controls.py

Timestamp:

May 15, 2008, 9:55:17 PM (17 years ago)

Author:

ecprice

Message:

Use joins, new xmlist.py

File:

• trunk/packages/sipb-xen-www/code/controls.py (modified) (4 diffs)

trunk/packages/sipb-xen-www/code/controls.py

@@ -12 +12 @@
 import re
 import cache_acls
+import cPickle
 
 # ... and stolen from xend/uuid.py
@@ -114 +115 @@
         machine.type_id = machine_type.type_id
         ctx.current.save(machine)
-        disk = Disk(machine_id=machine.machine_id, 
+        disk = Disk(machine_id=machine.machine_id,
                     guest_device_name='hda', size=disk_size)
         open_nics = NIC.select_by(machine_id=None)
@@ -123 +124 @@
         nic.machine_id = machine.machine_id
         nic.hostname = name
-        ctx.current.save(nic)    
+        ctx.current.save(nic)
         ctx.current.save(disk)
         cache_acls.refreshMachine(machine)
@@ -137 +138 @@
     return machine
 
-def getUptimes(machines=None):
-    """Return a dictionary mapping machine names to uptime strings"""
-    value_string = remctl('web', 'listvms')
-    lines = value_string.splitlines()
-    d = {}
-    for line in lines:
-        lst = line.split()
-        name, id = lst[:2]
-        uptime = ' '.join(lst[2:])
-        d[name] = uptime
-    ans = {}
-    for m in machines:
-        ans[m] = d.get(m.name)
-    return ans
+def getList(machines):
+    """Return a dictionary mapping machine  to dicts."""
+    value_string = remctl('web', 'listvms', '--pickle')
+    value_dict = cPickle.loads(value_string)
+
+    d = dict((m, value_dict[m.name]) for m in machines if m.name in value_dict)
+    return d
 
 def parseStatus(s):