From 5c193e77812c306e968e9fae6855ebbc39cdf0fc Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Fri, 17 Jan 2025 13:22:48 +0100 Subject: added carbon tests (#292) * Initial push * Added carbon tests * spotless * small update to test * Updated build file * Updated build file * small test * small update * Test * Test * Updated CarbonTraces to UTC. updated the tests accordingly * spotless --- .../carbonTraces/2022-01-01_2022-12-31_BE.parquet | Bin 0 -> 156106 bytes .../carbonTraces/2022-01-01_2022-12-31_DE.parquet | Bin 0 -> 633003 bytes .../carbonTraces/2022-01-01_2022-12-31_FR.parquet | Bin 0 -> 156082 bytes .../carbonTraces/2022-01-01_2022-12-31_NL.parquet | Bin 0 -> 633006 bytes .../resources/topologies/single_1_2000_BE.json | 31 +++++++++++++++++++++ .../resources/topologies/single_1_2000_DE.json | 31 +++++++++++++++++++++ .../resources/topologies/single_1_2000_FR.json | 31 +++++++++++++++++++++ .../resources/topologies/single_1_2000_NL.json | 31 +++++++++++++++++++++ .../bitbrains-small/fragments.parquet | Bin 0 -> 717069 bytes .../bitbrains-small/interference-model.json | 21 ++++++++++++++ .../workloadTraces/bitbrains-small/tasks.parquet | Bin 0 -> 5525 bytes .../workloadTraces/single_task/fragments.parquet | Bin 0 -> 3012 bytes .../workloadTraces/single_task/tasks.parquet | Bin 0 -> 4471 bytes .../bitbrains-small/fragments.parquet | Bin 717069 -> 0 bytes .../bitbrains-small/interference-model.json | 21 -------------- .../workload_traces/bitbrains-small/tasks.parquet | Bin 5525 -> 0 bytes .../workload_traces/single_task/fragments.parquet | Bin 3012 -> 0 bytes .../workload_traces/single_task/tasks.parquet | Bin 4471 -> 0 bytes 18 files changed, 145 insertions(+), 21 deletions(-) create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_BE.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_DE.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_FR.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_NL.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_BE.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_DE.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_FR.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_NL.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/fragments.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/interference-model.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/tasks.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/single_task/fragments.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/single_task/tasks.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/fragments.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/interference-model.json delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/tasks.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/fragments.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/tasks.parquet (limited to 'opendc-experiments/opendc-experiments-base/src/test/resources') diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_BE.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_BE.parquet new file mode 100644 index 00000000..ab2b5f8b Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_BE.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_DE.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_DE.parquet new file mode 100644 index 00000000..213e24a4 Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_DE.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_FR.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_FR.parquet new file mode 100644 index 00000000..a2d64d8f Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_FR.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_NL.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_NL.parquet new file mode 100644 index 00000000..6b4a05ad Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/carbonTraces/2022-01-01_2022-12-31_NL.parquet differ 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 new file mode 100644 index 00000000..3a04b275 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_BE.json @@ -0,0 +1,31 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "powerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + } + } + ], + "powerSource": { + "carbonTracePath": "src/test/resources/carbonTraces/2022-01-01_2022-12-31_BE.parquet" + } + } + ] +} 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 new file mode 100644 index 00000000..651e8b54 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_DE.json @@ -0,0 +1,31 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "powerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + } + } + ], + "powerSource": { + "carbonTracePath": "src/test/resources/carbonTraces/2022-01-01_2022-12-31_DE.parquet" + } + } + ] +} 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 new file mode 100644 index 00000000..fed097e9 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_FR.json @@ -0,0 +1,31 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "powerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + } + } + ], + "powerSource": { + "carbonTracePath": "src/test/resources/carbonTraces/2022-01-01_2022-12-31_FR.parquet" + } + } + ] +} 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 new file mode 100644 index 00000000..05805c88 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000_NL.json @@ -0,0 +1,31 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "powerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + } + } + ], + "powerSource": { + "carbonTracePath": "src/test/resources/carbonTraces/2022-01-01_2022-12-31_NL.parquet" + } + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/fragments.parquet new file mode 100644 index 00000000..240f58e3 Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/fragments.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/interference-model.json b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/interference-model.json new file mode 100644 index 00000000..51fc6366 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/interference-model.json @@ -0,0 +1,21 @@ +[ + { + "vms": [ + "141", + "379", + "851", + "116" + ], + "minServerLoad": 0.0, + "performanceScore": 0.8830158730158756 + }, + { + "vms": [ + "205", + "116", + "463" + ], + "minServerLoad": 0.0, + "performanceScore": 0.7133055555552751 + } +] diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/tasks.parquet new file mode 100644 index 00000000..8e9dcea7 Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/bitbrains-small/tasks.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/single_task/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/single_task/fragments.parquet new file mode 100644 index 00000000..94a2d69e Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/single_task/fragments.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/single_task/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/single_task/tasks.parquet new file mode 100644 index 00000000..2a7da2eb Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/single_task/tasks.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/fragments.parquet deleted file mode 100644 index 240f58e3..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/fragments.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/interference-model.json b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/interference-model.json deleted file mode 100644 index 51fc6366..00000000 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/interference-model.json +++ /dev/null @@ -1,21 +0,0 @@ -[ - { - "vms": [ - "141", - "379", - "851", - "116" - ], - "minServerLoad": 0.0, - "performanceScore": 0.8830158730158756 - }, - { - "vms": [ - "205", - "116", - "463" - ], - "minServerLoad": 0.0, - "performanceScore": 0.7133055555552751 - } -] diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/tasks.parquet deleted file mode 100644 index 8e9dcea7..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/tasks.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/fragments.parquet deleted file mode 100644 index 94a2d69e..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/fragments.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/tasks.parquet deleted file mode 100644 index 2a7da2eb..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/tasks.parquet and /dev/null differ -- cgit v1.2.3