From dff30fa60809c018101052f395b09cf17cb83ccb Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Tue, 19 Mar 2024 20:26:04 +0100 Subject: Scenario and Portfolio update (#209) * Initial commit * Implemented a new systems of defining and running scenarios / portfolios. Scenarios and Portfolios can now be defined using JSON files similar to topologies. This allows user to define experiments without changing any KotLin code. * Ran spotlessApply --- .../bitbrains-small/interference-model.json | 21 +++++++ .../resources/bitbrains-small/trace/meta.parquet | Bin 0 -> 2723 bytes .../resources/bitbrains-small/trace/trace.parquet | Bin 0 -> 2163354 bytes .../src/main/resources/env/multi.json | 66 +++++++++++++++++++++ .../src/main/resources/env/single.json | 26 ++++++++ .../src/main/resources/log4j2.xml | 43 ++++++++++++++ .../src/main/resources/scenario.json | 13 ++++ 7 files changed, 169 insertions(+) create mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/interference-model.json create mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/meta.parquet create mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/trace.parquet create mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/env/multi.json create mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/env/single.json create mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/log4j2.xml create mode 100644 opendc-experiments/opendc-experiments-scenario/src/main/resources/scenario.json (limited to 'opendc-experiments/opendc-experiments-scenario/src/main/resources') diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/interference-model.json b/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/interference-model.json new file mode 100644 index 00000000..51fc6366 --- /dev/null +++ b/opendc-experiments/opendc-experiments-scenario/src/main/resources/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-scenario/src/main/resources/bitbrains-small/trace/meta.parquet b/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/meta.parquet new file mode 100644 index 00000000..9cded35f Binary files /dev/null and b/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/meta.parquet differ diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/trace.parquet b/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/trace.parquet new file mode 100644 index 00000000..9d953956 Binary files /dev/null and b/opendc-experiments/opendc-experiments-scenario/src/main/resources/bitbrains-small/trace/trace.parquet differ diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/multi.json b/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/multi.json new file mode 100644 index 00000000..721005b0 --- /dev/null +++ b/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/multi.json @@ -0,0 +1,66 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpus": + [ + { + "coreCount": 32, + "coreSpeed": 3200 + } + ], + "memory": { + "memorySize": 256000 + } + } + ] + }, + { + "name": "C02", + "hosts" : + [ + { + "name": "H02", + "count": 6, + "cpus": + [ + { + "coreCount": 8, + "coreSpeed": 2930 + } + ], + "memory": { + "memorySize": 64000 + } + } + ] + }, + { + "name": "C03", + "hosts" : + [ + { + "name": "H03", + "count": 2, + "cpus": + [ + { + "coreCount": 16, + "coreSpeed": 3200 + } + ], + "memory": { + "memorySize": 128000 + } + } + ] + } + ] +} + + diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/single.json b/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/single.json new file mode 100644 index 00000000..a1c8d95a --- /dev/null +++ b/opendc-experiments/opendc-experiments-scenario/src/main/resources/env/single.json @@ -0,0 +1,26 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpus": + [ + { + "coreCount": 8, + "coreSpeed": 3200 + } + ], + "memory": { + "memorySize": 128000 + } + } + ] + } + ] +} + + diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/log4j2.xml b/opendc-experiments/opendc-experiments-scenario/src/main/resources/log4j2.xml new file mode 100644 index 00000000..e479f2ca --- /dev/null +++ b/opendc-experiments/opendc-experiments-scenario/src/main/resources/log4j2.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/opendc-experiments/opendc-experiments-scenario/src/main/resources/scenario.json b/opendc-experiments/opendc-experiments-scenario/src/main/resources/scenario.json new file mode 100644 index 00000000..854d9b8f --- /dev/null +++ b/opendc-experiments/opendc-experiments-scenario/src/main/resources/scenario.json @@ -0,0 +1,13 @@ +{ + "runs": 5, + "topology": { + "pathToFile": "resources/env/single.json" + }, + "workload": { + "pathToFile": "resources/bitbrains-small", + "type": "ComputeWorkload" + }, + "allocationPolicy": { + "policyType": "Mem" + } +} -- cgit v1.2.3