[haizea-commit] r844 - branches/1.1/src/haizea/core/enact

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

Author: borja
Date: 2010-10-20 14:46:19 -0500 (Wed, 20 Oct 2010)
New Revision: 844

Modified:
   branches/1.1/src/haizea/core/enact/opennebula.py
Log:
Correctly detect the number of CPU instances on the hosts

Modified: branches/1.1/src/haizea/core/enact/opennebula.py
===================================================================
--- branches/1.1/src/haizea/core/enact/opennebula.py	2010-10-20 19:45:59 UTC (rev 843)
+++ branches/1.1/src/haizea/core/enact/opennebula.py	2010-10-20 19:46:19 UTC (rev 844)
@@ -44,15 +44,17 @@
         self.max_nod_id = 0
         self.nodes = {}
 
+        self.logger.info("Fetching nodes from OpenNebula")            
+        self.__fetch_nodes()
+        self.logger.info("Fetched %i nodes from OpenNebula" % len(self.nodes))            
+
+        cpu_instances = max([n.capacity.ninstances[constants.RES_CPU] for n in self.nodes.values()])
+
         self.resource_types = []
-        self.resource_types.append((constants.RES_CPU,1))
+        self.resource_types.append((constants.RES_CPU,cpu_instances))
         self.resource_types.append((constants.RES_MEM,1))
         self.resource_types.append((constants.RES_DISK,1))
-                    
-        self.logger.info("Fetching nodes from OpenNebula")            
-        self.__fetch_nodes()
-        self.logger.info("Fetched %i nodes from OpenNebula" % len(self.nodes))            
-        
+                
     def refresh(self):
         return self.__fetch_nodes()