From 0203254b709614fa732c114aa25916f61b8b3275 Mon Sep 17 00:00:00 2001 From: Niels Thiele Date: Sun, 22 Jun 2025 12:31:21 +0200 Subject: Implemented Single GPU Support & outline of host-level allocation policies (#342) * renamed performance counter to distinguish different resource types * added GPU, modelled similar to CPU * added GPUs to machine model * list of GPUs instead of single instance * renamed memory speed to bandwidth * enabled parsing of GPU resources * split powermodel into cpu and GPU powermodel * added gpu parsing tests * added idea of host level scheduling * added tests for multi gpu parsing * renamed powermodel to cpupowermodel * clarified naming of cpu and gpu components * added resource type to flow suplier and edge * added resourcetype * added GPU components and resource type to fragments * added GPU to workload and updated resource usage retrieval * implemented first version of multi resource * added name to workload * renamed perfomance counters * removed commented out code * removed deprecated comments * included demand and supply into calculations * resolving rebase mismatches * moved resource type from flowedge class to common package * added available resources to machinees * cleaner separation if workload is started of simmachine or vm * Replaced exception with dedicated enum * Only looping over resources that are actually used * using hashmaps to handle resourcetype instead of arrays for readability * fixed condition * tracking finished workloads per resource type * removed resource type from flowedge * made supply and demand distribution resource specific * added power model for GPU * removed unused test setup * removed depracated comments * removed unused parameter * added ID for GPU * added GPUs and GPU performance counters (naively) * implemented capturing of GPU statistics * added reminders for future implementations * renamed properties for better identification * added capturing GPU statistics * implemented first tests for GPUs * unified access to performance counters * added interface for general compute resource handling * implemented multi resource support in simmachine * added individual edge to VM per resource * extended compute resource interface * implemented multi-resource support in PSU * implemented generic retrieval of computeresources * implemented mult-resource suppport in vm * made method use more resource specific * implemented simple GPU tests * rolled back frquency and demand use * made naming independent of used resource * using workloads resources instead of VMs to determine available resource * implemented determination of used resources in workload * removed logging statements * implemented reading from workload * fixed naming for host-level allocation * fixed next deadline calculation * fixed forwarding supply * reduced memory footprint * made GPU powermodel nullable * maded Gpu powermodel configurable in topology * implemented tests for basic gpu scheduler * added gpu properties * implemented weights, filter and simple cpu-gpu scheduler * spotless apply * spotless apply pt. 2 * fixed capitalization * spotless kotlin run * implemented coloumn export * todo update * removed code comments * Merged PerformanceCounter classes into one & removed interface * removed GPU specific powermodel * Rebase master: kept both versions of TopologyFactories * renamed CpuPowermodel to resource independent Powermodel Moved it from Cpu package to power package * implementated default of getResourceType & removed overrides if possible * split getResourceType into Consumer and Supplier * added power as resource type * reduced supply demand from arrayList to single value * combining GPUs into one large GPU, until full multi-gpu support * merged distribution policy enum with corresponding factory * added comment * post-rebase fixes * aligned naming * Added GPU metrics to task output * Updates power resource type to uppercase. Standardizes the `ResourceType.Power` enum to `ResourceType.POWER` for consistency with other resource types and improved readability. * Removes deprecated test assertions Removes commented-out assertions in GPU tests. These assertions are no longer needed and clutter the test code. * Renames MaxMinFairnessStrategy to Policy Renames MaxMinFairnessStrategy to MaxMinFairnessPolicy for clarity and consistency with naming conventions. This change affects the factory and distributor to use the updated name. * applies spotless * nulls GPUs as it is not used --- .../resources/topologies/Gpus/dual_gpu_host.json | 35 +++++++++++++ .../resources/topologies/Gpus/multi_gpu_full.json | 39 ++++++++++++++ .../resources/topologies/Gpus/multi_gpu_host.json | 36 +++++++++++++ .../topologies/Gpus/multi_gpu_no_memory.json | 36 +++++++++++++ .../topologies/Gpus/multi_gpu_no_vendor.json | 36 +++++++++++++ .../Gpus/multi_gpu_no_vendor_no_memory.json | 34 ++++++++++++ .../resources/topologies/Gpus/single_gpu_full.json | 44 ++++++++++++++++ .../topologies/Gpus/single_gpu_hosts.json | 61 ++++++++++++++++++++++ .../topologies/Gpus/single_gpu_no_memory.json | 36 +++++++++++++ .../topologies/Gpus/single_gpu_no_vendor.json | 35 +++++++++++++ .../Gpus/single_gpu_no_vendor_no_memory.json | 33 ++++++++++++ .../topologies/batteries/experiment1.json | 2 +- .../topologies/batteries/experiment2.json | 2 +- .../topologies/batteries/experiment3.json | 2 +- .../topologies/batteries/experiment4.json | 2 +- .../test/resources/topologies/single_1_2000.json | 2 +- .../resources/topologies/single_1_2000_BE.json | 2 +- .../resources/topologies/single_1_2000_DE.json | 2 +- .../resources/topologies/single_1_2000_FR.json | 2 +- .../resources/topologies/single_1_2000_NL.json | 2 +- .../test/resources/topologies/single_2_2000.json | 2 +- .../test/resources/topologies/single_50_big.json | 2 +- .../resources/topologies/single_50_big_BE.json | 2 +- 23 files changed, 437 insertions(+), 12 deletions(-) create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/dual_gpu_host.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_full.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_host.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_memory.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_vendor.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_vendor_no_memory.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_full.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_hosts.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_memory.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_vendor.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_vendor_no_memory.json (limited to 'opendc-experiments/opendc-experiments-base/src/test/resources/topologies') diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/dual_gpu_host.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/dual_gpu_host.json new file mode 100644 index 00000000..c5271ff8 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/dual_gpu_host.json @@ -0,0 +1,35 @@ +{ + "clusters": [ + { + "name": "C01", + "hosts": [ + { + "name": "DualGpuHost", + "cpu": { + "coreCount": 4, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": { + "coreCount": 2, + "coreSpeed": 2000 + }, + "gpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + } + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_full.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_full.json new file mode 100644 index 00000000..334100fc --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_full.json @@ -0,0 +1,39 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": { + "count": 5, + "coreCount": 5120, + "coreSpeed": 5000, + "memorySize": 30517578125, + "memoryBandwidth": "900 GBps", + "vendor": "NVIDIA", + "modelName": "Tesla V100", + "architecture": "Volta" + } + } + ] + } + ] +} + diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_host.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_host.json new file mode 100644 index 00000000..719f0ab2 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_host.json @@ -0,0 +1,36 @@ +{ + "clusters": [ + { + "name": "C01", + "hosts": [ + { + "name": "DualGpuHost", + "cpu": { + "coreCount": 4, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": { + "count": 2, + "coreCount": 1, + "coreSpeed": 2000 + }, + "gpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + } + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_memory.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_memory.json new file mode 100644 index 00000000..3757e641 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_memory.json @@ -0,0 +1,36 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": { + "count": 2, + "coreCount": 1, + "coreSpeed": 2000, + "vendor": "NVIDIA", + "modelName": "Tesla V100", + "architecture": "Volta" + } + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_vendor.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_vendor.json new file mode 100644 index 00000000..07aaac7c --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_vendor.json @@ -0,0 +1,36 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": { + "count": 100, + "coreCount": 1, + "coreSpeed": 2000, + "memorySize": 4096, + "memoryBandwidth": 500 + } + } + ] + } + ] +} + diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_vendor_no_memory.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_vendor_no_memory.json new file mode 100644 index 00000000..3d036eef --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_vendor_no_memory.json @@ -0,0 +1,34 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": + { + "count": 3, + "coreCount": 1, + "coreSpeed": 2000 + } + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_full.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_full.json new file mode 100644 index 00000000..8e4c3546 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_full.json @@ -0,0 +1,44 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": + { + "coreCount": 5120, + "coreSpeed": 5000, + "memorySize": 30517578125, + "memoryBandwidth": "900 GBps", + "vendor": "NVIDIA", + "modelName": "Tesla V100", + "architecture": "Volta" + }, + "gpuPowerModel": { + "modelType": "linear", + "power": 800.0, + "idlePower": 300.0, + "maxPower": 600.0 + } + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_hosts.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_hosts.json new file mode 100644 index 00000000..44b83ef7 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_hosts.json @@ -0,0 +1,61 @@ +{ + "clusters": [ + { + "name": "C01", + "hosts": [ + { + "name": "SingleGpuHost1", + "cpu": { + "coreCount": 2, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": { + "coreCount": 1, + "coreSpeed": 2000 + }, + "gpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + } + }, + { + "name": "SingleGpuHost2", + "cpu": { + "coreCount": 2, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": { + "coreCount": 1, + "coreSpeed": 2000 + }, + "gpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + } + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_memory.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_memory.json new file mode 100644 index 00000000..85be1e6e --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_memory.json @@ -0,0 +1,36 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": + { + "coreCount": 1, + "coreSpeed": 2000, + "vendor": "NVIDIA", + "modelName": "Tesla V100", + "architecture": "Volta" + } + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_vendor.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_vendor.json new file mode 100644 index 00000000..b54fab75 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_vendor.json @@ -0,0 +1,35 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": + { + "coreCount": 1, + "coreSpeed": 2000, + "memorySize": 4096, + "memoryBandwidth": 500 + } + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_vendor_no_memory.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_vendor_no_memory.json new file mode 100644 index 00000000..ed01cf46 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_vendor_no_memory.json @@ -0,0 +1,33 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "cpuPowerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + }, + "gpu": + { + "coreCount": 1, + "coreSpeed": 2000 + } + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment1.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment1.json index 8835faeb..ad12a3e5 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment1.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment1.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment2.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment2.json index 8882af09..cbddf7f8 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment2.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment2.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment3.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment3.json index d78626f1..06a2163c 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment3.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment3.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment4.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment4.json index cb0ef4e5..c6e67b6b 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment4.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment4.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000.json index ac9a3082..36a1efd7 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_BE.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_BE.json index 3a04b275..1eb20867 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_BE.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_BE.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_DE.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_DE.json index 651e8b54..d11ecc2f 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_DE.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_DE.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_FR.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_FR.json index fed097e9..ebec67e5 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_FR.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_FR.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_NL.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_NL.json index 05805c88..8f5ba1c6 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_NL.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_NL.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_2_2000.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_2_2000.json index 24ab0bcd..e34e0256 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_2_2000.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_2_2000.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big.json index 676d4f3d..47c633c9 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big_BE.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big_BE.json index d2c19861..fe4e4813 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big_BE.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big_BE.json @@ -15,7 +15,7 @@ "memory": { "memorySize": 140457600000 }, - "powerModel": { + "cpuPowerModel": { "modelType": "linear", "power": 400.0, "idlePower": 100.0, -- cgit v1.2.3