diff options
Diffstat (limited to 'opendc-experiments/opendc-experiments-m3sa/src/test')
4 files changed, 4 insertions, 4 deletions
diff --git a/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_asymptotic1.json b/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_asymptotic1.json index 884d27a4..7f5d5f0e 100644 --- a/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_asymptotic1.json +++ b/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_asymptotic1.json @@ -13,7 +13,7 @@ "memory": { "memorySize": 128000000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "asymptotic", "power": 400.0, "idlePower": 32.0, diff --git a/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_asymptotic2.json b/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_asymptotic2.json index 612d5e5a..ad6bdc35 100644 --- a/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_asymptotic2.json +++ b/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_asymptotic2.json @@ -13,7 +13,7 @@ "memory": { "memorySize": 128000000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "asymptotic", "power": 400.0, "idlePower": 32.0, diff --git a/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_mse.json b/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_mse.json index 0cfef148..25922d7d 100644 --- a/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_mse.json +++ b/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_mse.json @@ -13,7 +13,7 @@ "memory": { "memorySize": 128000000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "mse", "power": 400.0, "idlePower": 32.0, diff --git a/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_sqrt.json b/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_sqrt.json index c02c8b80..55b4e0ef 100644 --- a/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_sqrt.json +++ b/opendc-experiments/opendc-experiments-m3sa/src/test/resources/topologies/experiment1/topology_sqrt.json @@ -13,7 +13,7 @@ "memory": { "memorySize": 128000000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "sqrt", "power": 400.0, "idlePower": 32.0, |