[haizea-commit] r842 - branches/1.1/src/haizea/core/scheduler

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2010-10-20 14:43:42 -0500 (Wed, 20 Oct 2010)
New Revision: 842

Modified:
   branches/1.1/src/haizea/core/scheduler/resourcepool.py
Log:
When marshalling the information about a host, include the sum of all the CPU instances (not entirely accurate, but still better than just reporting the first instance)

Modified: branches/1.1/src/haizea/core/scheduler/resourcepool.py
===================================================================
--- branches/1.1/src/haizea/core/scheduler/resourcepool.py	2010-10-20 19:43:02 UTC (rev 841)
+++ branches/1.1/src/haizea/core/scheduler/resourcepool.py	2010-10-20 19:43:42 UTC (rev 842)
@@ -263,7 +263,7 @@
         h = {}
         h["id"] = self.id
         h["hostname"] = self.hostname
-        h["cpu"] = self.capacity.get_quantity(constants.RES_CPU)
+        h["cpu"] = sum(self.capacity.quantity[constants.RES_CPU])
         h["mem"] = self.capacity.get_quantity(constants.RES_MEM)
                 
         return h