From 47b86312a6715e20bab90be552439339ec9cf5c5 Mon Sep 17 00:00:00 2001 From: Guillaume Raffy Date: Tue, 3 Jul 2012 14:38:29 +0000 Subject: [PATCH] =?UTF-8?q?correction=20du=20bug=20240=20:=20maintenant=20?= =?UTF-8?q?que=20les=20machines=20peuvent=20=C3=AAtre=20ajout=C3=A9es=20?= =?UTF-8?q?=C3=A0=20la=20vol=C3=A9e,=20les=20machines=20ne=20sont=20pas=20?= =?UTF-8?q?n=C3=A9c=C3=A9ssairement=20pr=C3=AAtes=20tout=20de=20suite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ClusterController/ClusterStatus.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ClusterController/ClusterStatus.py b/ClusterController/ClusterStatus.py index 111af65..9a4be60 100644 --- a/ClusterController/ClusterStatus.py +++ b/ClusterController/ClusterStatus.py @@ -147,19 +147,22 @@ class ClusterStatus: """ fEnergySavings = 0.0 for machine in self.m_clusterNodes.itervalues(): - fEnergySavings += machine.getEnergySavings() + if machine.isReady(): + fEnergySavings += machine.getEnergySavings() return fEnergySavings def getCurrentPowerConsumption( self ): fPowerConsumption = 0.0 for machine in self.m_clusterNodes.itervalues(): - fPowerConsumption += machine.getPowerConsumption() + if machine.isReady(): + fPowerConsumption += machine.getPowerConsumption() return fPowerConsumption def getCurrentPowerSavings( self ): fPowerSavings = 0.0 for machine in self.m_clusterNodes.itervalues(): - fPowerSavings += machine.getPowerConsumptionForPowerState( PowerState.ON ) - machine.getPowerConsumption() + if machine.isReady(): + fPowerSavings += machine.getPowerConsumptionForPowerState( PowerState.ON ) - machine.getPowerConsumption() return fPowerSavings def getNumControlledSlots( self ):