summaryrefslogtreecommitdiff
path: root/src/g5k/energyFromLogs.sh
diff options
context:
space:
mode:
Diffstat (limited to 'src/g5k/energyFromLogs.sh')
-rwxr-xr-xsrc/g5k/energyFromLogs.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/g5k/energyFromLogs.sh b/src/g5k/energyFromLogs.sh
index 0336f03..6a5e9eb 100755
--- a/src/g5k/energyFromLogs.sh
+++ b/src/g5k/energyFromLogs.sh
@@ -20,7 +20,9 @@ do
nbSensors=$(getValue $cmd nbSensors)
simKey=$(getValue $cmd simKey)
delayStart=$(getValue $cmd delayStart)
- ./recordEnergy.sh nova $nodeName $from $to "${simKey}_${vmSize}VMSIZE_${nbSensors}NBSENSORS_${from}${to}.csv"
- ./recordEnergy.sh nova $nodeName $delayStart $from "${simKey}_${vmSize}VMSIZE_${nbSensors}NBSENSORS_${from}${to}_IDLE.csv"
+ python ./wattmeters.py $nodeName $from $to
+ mv power.csv "${simKey}_${vmSize}VMSIZE_${nbSensors}NBSENSORS_${from}${to}.csv"
+ python ./wattmeters.py $nodeName $delayStart $from
+ mv power.csv "${simKey}_${vmSize}VMSIZE_${nbSensors}NBSENSORS_${from}${to}_IDLE.csv"
done