Project

General

Profile

Revision 844

Correctly detect the number of CPU instances on the hosts

View differences:

opennebula.py
44 44
        self.max_nod_id = 0
45 45
        self.nodes = {}
46 46

  
47
        self.logger.info("Fetching nodes from OpenNebula")            
48
        self.__fetch_nodes()
49
        self.logger.info("Fetched %i nodes from OpenNebula" % len(self.nodes))            
50

  
51
        cpu_instances = max([n.capacity.ninstances[constants.RES_CPU] for n in self.nodes.values()])
52

  
47 53
        self.resource_types = []
48
        self.resource_types.append((constants.RES_CPU,1))
54
        self.resource_types.append((constants.RES_CPU,cpu_instances))
49 55
        self.resource_types.append((constants.RES_MEM,1))
50 56
        self.resource_types.append((constants.RES_DISK,1))
51
                    
52
        self.logger.info("Fetching nodes from OpenNebula")            
53
        self.__fetch_nodes()
54
        self.logger.info("Fetched %i nodes from OpenNebula" % len(self.nodes))            
55
        
57
                
56 58
    def refresh(self):
57 59
        return self.__fetch_nodes()
58 60
        

Also available in: Unified diff