From 192ca10f332c58d38d129709c64dd69c284683f5 Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Fri, 10 Jan 2025 14:34:50 +0100 Subject: Restructured Testing files (#287) --- .../Experiment/failureTraces/11_failures.parquet | Bin 2786 -> 0 bytes .../failureTraces/single_failure.parquet | Bin 2786 -> 0 bytes .../resources/Experiment/topologies/multi.json | 59 --------------------- .../resources/Experiment/topologies/single.json | 23 -------- .../traces/bitbrains-small/fragments.parquet | Bin 717069 -> 0 bytes .../traces/bitbrains-small/interference-model.json | 21 -------- .../traces/bitbrains-small/tasks.parquet | Bin 5525 -> 0 bytes .../traces/single_task/fragments.parquet | Bin 3012 -> 0 bytes .../Experiment/traces/single_task/tasks.parquet | Bin 4471 -> 0 bytes .../FlowDistributor/topologies/single_1_2000.json | 22 -------- .../FlowDistributor/topologies/single_2_2000.json | 22 -------- .../topologies/single_5000_2000.json | 23 -------- .../resources/failureTraces/single_failure.parquet | Bin 0 -> 2479 bytes .../failureTraces/single_failure_2.parquet | Bin 0 -> 2479 bytes .../resources/failureTraces/two_failures.parquet | Bin 0 -> 2495 bytes .../test/resources/topologies/single_1_2000.json | 28 ++++++++++ .../test/resources/topologies/single_2_2000.json | 28 ++++++++++ .../resources/topologies/single_5000_2000.json | 23 ++++++++ .../bitbrains-small/fragments.parquet | Bin 0 -> 717069 bytes .../bitbrains-small/interference-model.json | 21 ++++++++ .../workload_traces/bitbrains-small/tasks.parquet | Bin 0 -> 5525 bytes .../workload_traces/single_task/fragments.parquet | Bin 0 -> 3012 bytes .../workload_traces/single_task/tasks.parquet | Bin 0 -> 4471 bytes 23 files changed, 100 insertions(+), 170 deletions(-) delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/11_failures.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/single_failure.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/multi.json delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/single.json delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/fragments.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/interference-model.json delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/tasks.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/fragments.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/tasks.parquet delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_1_2000.json delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_2_2000.json delete mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_5000_2000.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure_2.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/two_failures.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_2_2000.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_5000_2000.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/fragments.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/interference-model.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/tasks.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/fragments.parquet create 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/Experiment/failureTraces/11_failures.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/11_failures.parquet deleted file mode 100644 index dbd93acb..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/11_failures.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/single_failure.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/single_failure.parquet deleted file mode 100644 index d1f8b853..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/failureTraces/single_failure.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/multi.json b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/multi.json deleted file mode 100644 index c3a060cc..00000000 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/multi.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "clusters": - [ - { - "name": "C01", - "hosts" : - [ - { - "name": "H01", - "cpu": - { - "coreCount": 32, - "coreSpeed": 3200 - }, - "memory": { - "memorySize": 256000 - } - } - ] - }, - { - "name": "C02", - "hosts" : - [ - { - "name": "H02", - "count": 6, - "cpu": - { - "coreCount": 8, - "coreSpeed": 2930 - }, - "memory": { - "memorySize": 64000 - } - } - ] - }, - { - "name": "C03", - "hosts" : - [ - { - "name": "H03", - "count": 2, - "cpu": - { - "coreCount": 16, - "coreSpeed": 3200 - }, - "memory": { - "memorySize": 128000 - } - } - ] - } - ] -} - diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/single.json b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/single.json deleted file mode 100644 index de66bfc2..00000000 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/topologies/single.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "clusters": - [ - { - "name": "C01", - "hosts" : - [ - { - "name": "H01", - "cpu": - { - "coreCount": 12, - "coreSpeed": 3300, - "count": 1 - }, - "memory": { - "memorySize": 140457600000 - } - } - ] - } - ] -} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/fragments.parquet deleted file mode 100644 index 240f58e3..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/fragments.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/interference-model.json b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/interference-model.json deleted file mode 100644 index 51fc6366..00000000 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/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/Experiment/traces/bitbrains-small/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/tasks.parquet deleted file mode 100644 index 8e9dcea7..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/bitbrains-small/tasks.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/fragments.parquet deleted file mode 100644 index 94a2d69e..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/fragments.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/tasks.parquet deleted file mode 100644 index 2a7da2eb..00000000 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/Experiment/traces/single_task/tasks.parquet and /dev/null differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_1_2000.json b/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_1_2000.json deleted file mode 100644 index 6790a10f..00000000 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_1_2000.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "clusters": - [ - { - "name": "C01", - "hosts" : - [ - { - "name": "H01", - "cpu": - { - "coreCount": 1, - "coreSpeed": 2000 - }, - "memory": { - "memorySize": 140457600000 - } - } - ] - } - ] -} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_2_2000.json b/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_2_2000.json deleted file mode 100644 index 4bab620a..00000000 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_2_2000.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "clusters": - [ - { - "name": "C01", - "hosts" : - [ - { - "name": "H01", - "cpu": - { - "coreCount": 2, - "coreSpeed": 2000 - }, - "memory": { - "memorySize": 140457600000 - } - } - ] - } - ] -} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_5000_2000.json b/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_5000_2000.json deleted file mode 100644 index 9f1e418f..00000000 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/FlowDistributor/topologies/single_5000_2000.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "clusters": - [ - { - "name": "C01", - "hosts" : - [ - { - "name": "H01", - "cpu": - { - "coreCount": 1, - "coreSpeed": 2000 - }, - "memory": { - "memorySize": 140457600000 - }, - "count": 5000 - } - ] - } - ] -} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure.parquet new file mode 100644 index 00000000..44804ffa Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure_2.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure_2.parquet new file mode 100644 index 00000000..7dae482a Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/single_failure_2.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/two_failures.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/two_failures.parquet new file mode 100644 index 00000000..9f0fea0f Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/failureTraces/two_failures.parquet differ 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 new file mode 100644 index 00000000..ac9a3082 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_1_2000.json @@ -0,0 +1,28 @@ +{ + "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 + } + } + ] + } + ] +} 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 new file mode 100644 index 00000000..24ab0bcd --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_2_2000.json @@ -0,0 +1,28 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 2, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "powerModel": { + "modelType": "linear", + "power": 400.0, + "idlePower": 100.0, + "maxPower": 200.0 + } + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_5000_2000.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_5000_2000.json new file mode 100644 index 00000000..9f1e418f --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_5000_2000.json @@ -0,0 +1,23 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 1, + "coreSpeed": 2000 + }, + "memory": { + "memorySize": 140457600000 + }, + "count": 5000 + } + ] + } + ] +} 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 new file mode 100644 index 00000000..240f58e3 Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/bitbrains-small/fragments.parquet 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 new file mode 100644 index 00000000..51fc6366 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/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/workload_traces/bitbrains-small/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/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/workload_traces/bitbrains-small/tasks.parquet 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 new file mode 100644 index 00000000..94a2d69e Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/fragments.parquet 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 new file mode 100644 index 00000000..2a7da2eb Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/workload_traces/single_task/tasks.parquet differ -- cgit v1.2.3