summaryrefslogtreecommitdiff
path: root/opendc-experiments/opendc-experiments-base/src/test/resources/topologies
diff options
context:
space:
mode:
Diffstat (limited to 'opendc-experiments/opendc-experiments-base/src/test/resources/topologies')
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/dual_gpu_host.json35
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_full.json39
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_host.json36
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_memory.json36
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_vendor.json36
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/multi_gpu_no_vendor_no_memory.json34
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_full.json44
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_hosts.json61
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_memory.json36
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_vendor.json35
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/Gpus/single_gpu_no_vendor_no_memory.json33
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment1.json2
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment2.json2
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment3.json2
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/batteries/experiment4.json2
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000.json2
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_BE.json2
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_DE.json2
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_FR.json2
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_NL.json2
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_2_2000.json2
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big.json2
-rw-r--r--opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big_BE.json2
23 files changed, 437 insertions, 12 deletions
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,