Changeset 554 for trunk

Timestamp:

Jun 2, 2008, 1:48:27 AM (16 years ago)

Author:

ecprice

Message:

Avoid a second remctl to determine whether ice3 is up

Location:

trunk/packages/sipb-xen-www/code

Files:

• controls.py (modified) (1 diff)
• main.py (modified) (1 diff)
• webcommon.py (modified) (1 diff)

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

@@ -138 +138 @@
     return machine
 
-def getList(machines):
-    """Return a dictionary mapping machine  to dicts."""
+def getList():
+    """Return a dictionary mapping machine names to dicts."""
     value_string = remctl('web', 'listvms')
     value_dict = yaml.safe_load(value_string)
-
-    d = dict((m, value_dict[m.name]) for m in machines if m.name in value_dict)
-    return d
+    return value_dict
 
 def parseStatus(s):

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

@@ -204 +204 @@
     xmlist = g.xmlist
     checkpoint.checkpoint('Got uptimes')
-    can_clone = (controls.getList([Machine.get_by(name='ice3')])) == {}
+    can_clone = 'ice3' in g.xmlist_raw
     for m in machines:
         if m not in xmlist:

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

@@ -44 +44 @@
     machines = cachedproperty(lambda self:
                                   Machine.query().join('acl').select_by(user=self.user))
+    xmlist_raw = cachedproperty(lambda self: controls.getList())
     xmlist = cachedproperty(lambda self:
-                                controls.getList(self.machines))
+                                dict((m, self.xmlist_raw[m.name])
+                                     for m in self.machines
+                                     if m.name in self.xmlist_raw))
 
     def clear(self):