From 1de770c981498e2ca0067876470484e2cd08d780 Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Wed, 26 Nov 2025 11:11:22 +0100 Subject: Fixed a small bug in the reading of workflows (#382) * Fixed a small bug in the reading of workflows * small update * Pushing workload files needed for ExperimentCliTest 3 --- .../opendc/experiments/base/ExperimentCliTest.kt | 14 +++++++++++ .../test/resources/experiments/experiment_3.json | 26 +++++++++++++++++++++ .../resources/topologies/workflow_topology.json | 23 ++++++++++++++++++ .../workflow_example/fragments.parquet | Bin 0 -> 2195 bytes .../workloadTraces/workflow_example/tasks.parquet | Bin 0 -> 5249 bytes 5 files changed, 63 insertions(+) create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/experiments/experiment_3.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/topologies/workflow_topology.json create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/workflow_example/fragments.parquet create mode 100644 opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/workflow_example/tasks.parquet (limited to 'opendc-experiments') diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ExperimentCliTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ExperimentCliTest.kt index 748a020c..1b64ccc9 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ExperimentCliTest.kt +++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ExperimentCliTest.kt @@ -57,4 +57,18 @@ class ExperimentCliTest { val someDir = File("output") someDir.deleteRecursively() } + + /** + * ExperimentCli test 3 + * This test runs the experiment defined in the experiment_3.json file. + * + * In this test, a small workflow is executed. + */ + @Test + fun testExperimentCli3() { + ExperimentCommand().main(arrayOf("--experiment-path", "src/test/resources/experiments/experiment_3.json")) + + val someDir = File("output") + someDir.deleteRecursively() + } } diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/experiments/experiment_3.json b/opendc-experiments/opendc-experiments-base/src/test/resources/experiments/experiment_3.json new file mode 100644 index 00000000..c8610bd1 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/experiments/experiment_3.json @@ -0,0 +1,26 @@ +{ + "name": "simple", + "topologies": [ + { + "pathToFile": "src/test/resources/topologies/workflow_topology.json" + } + ], + "workloads": [ + { + "pathToFile": "src/test/resources/workloadTraces/workflow_example", + "type": "ComputeWorkload" + } + ], + "exportModels": [ + { + "exportInterval": 60, + "printFrequency": 168, + "filesToExport": [ + "host", + "powerSource", + "service", + "task" + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/workflow_topology.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/workflow_topology.json new file mode 100644 index 00000000..7932efd2 --- /dev/null +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/workflow_topology.json @@ -0,0 +1,23 @@ +{ + "clusters": + [ + { + "name": "C01", + "hosts" : + [ + { + "name": "H01", + "cpu": + { + "coreCount": 12, + "coreSpeed": 3300 + }, + "memory": { + "memorySize": 140457600000 + }, + "count": 3 + } + ] + } + ] +} diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/workflow_example/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/workflow_example/fragments.parquet new file mode 100644 index 00000000..d7b7a096 Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/workflow_example/fragments.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/workflow_example/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/workflow_example/tasks.parquet new file mode 100644 index 00000000..91cddf7a Binary files /dev/null and b/opendc-experiments/opendc-experiments-base/src/test/resources/workloadTraces/workflow_example/tasks.parquet differ -- cgit v1.2.3