Fixed bug when not providing a Carbon Model (#339)

6 files changed, 151 insertions, 19 deletions

diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentCli.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentCli.kt
index f4df7991..d231b93b 100644
--- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentCli.kt
+++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentCli.kt
@@ -43,12 +43,12 @@ internal class ExperimentCommand : CliktCommand(name = "experiment") {
     /**
      * The path to the environment directory.
      */
-    private val scenarioPath by option("--experiment-path", help = "path to experiment file")
+    private val experimentPath by option("--experiment-path", help = "path to experiment file")
         .file(canBeDir = false, canBeFile = true)
         .defaultLazy { File("resources/experiment.json") }
 
     override fun run() {
-        val experiment = getExperiment(scenarioPath)
+        val experiment = getExperiment(experimentPath)
         runExperiment(experiment)
     }
 }
diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt
index 15445450..f7c444ea 100644
--- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt
+++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt
@@ -131,23 +131,27 @@ public fun runScenario(
             service.setTasksExpected(workload.size)
             service.setMetricReader(provisioner.getMonitor())
 
-            val carbonModel = provisioner.registry.resolve(serviceDomain, CarbonModel::class.java)!!
-            val computeScheduler = provisioner.registry.resolve(serviceDomain, ComputeScheduler::class.java)!!
-            if (computeScheduler is CarbonReceiver) {
-                carbonModel.addReceiver(computeScheduler)
-            }
-            carbonModel.addReceiver(service)
-
-            if (scenario.allocationPolicySpec is TimeShiftAllocationPolicySpec) {
-                val taskStopper =
-                    createTaskStopper(
-                        scenario.allocationPolicySpec.taskStopper,
-                        coroutineContext,
-                        timeSource,
-                    )
-                if (taskStopper != null) {
-                    taskStopper.setService(service)
-                    carbonModel.addReceiver(taskStopper)
+            var carbonModel: CarbonModel? = null
+            if (provisioner.registry.hasService(serviceDomain, CarbonModel::class.java)) {
+                carbonModel = provisioner.registry.resolve(serviceDomain, CarbonModel::class.java)!!
+
+                val computeScheduler = provisioner.registry.resolve(serviceDomain, ComputeScheduler::class.java)!!
+                if (computeScheduler is CarbonReceiver) {
+                    carbonModel.addReceiver(computeScheduler)
+                    carbonModel.addReceiver(service)
+                }
+
+                if (scenario.allocationPolicySpec is TimeShiftAllocationPolicySpec) {
+                    val taskStopper =
+                        createTaskStopper(
+                            scenario.allocationPolicySpec.taskStopper,
+                            coroutineContext,
+                            timeSource,
+                        )
+                    if (taskStopper != null) {
+                        taskStopper.setService(service)
+                        carbonModel.addReceiver(taskStopper)
+                    }
                 }
             }
 
diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ExperimentRunnerTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ExperimentRunnerTest.kt
new file mode 100644
index 00000000..6365f60d
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ExperimentRunnerTest.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2020 AtLarge Research
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package org.opendc.experiments.base
+
+import org.junit.jupiter.api.Test
+import org.opendc.experiments.base.runner.ExperimentCommand
+import java.io.File
+
+/**
+ * An integration test suite for the Experiment Runner.
+ */
+class ExperimentRunnerTest {
+    /**
+     * ExperimentRunner test 1
+     * This test runs the experiment defined in the experiment_1.json file.
+     *
+     * In this test, the bitbrains-small workload is executed with and without a carbon trace.
+     */
+    @Test
+    fun testExperimentRunner1() {
+        ExperimentCommand().main(arrayOf("--experiment-path", "src/test/resources/experiments/experiment_1.json"))
+
+        val someDir = File("output")
+        someDir.deleteRecursively()
+    }
+}
diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/experiments/experiment_1.json b/opendc-experiments/opendc-experiments-base/src/test/resources/experiments/experiment_1.json
new file mode 100644
index 00000000..48ae75ce
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/experiments/experiment_1.json
@@ -0,0 +1,23 @@
+{
+    "topologies": [
+        {"pathToFile": "src/test/resources/topologies/single_50_big.json"},
+        {"pathToFile": "src/test/resources/topologies/single_50_big_BE.json"}
+    ],
+    "workloads": [{
+        "pathToFile": "src/test/resources/workloadTraces/bitbrains-small",
+        "type": "ComputeWorkload",
+        "submissionTime": "2024-03-01T00:00:00"
+    }],
+    "allocationPolicies": [
+        {
+            "type": "prefab",
+            "policyName": "Mem"
+        }
+    ],
+    "exportModels": [
+        {
+            "exportInterval": 3600,
+            "printFrequency": 24
+        }
+    ]
+}
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
new file mode 100644
index 00000000..676d4f3d
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big.json
@@ -0,0 +1,28 @@
+{
+    "clusters":
+    [
+        {
+            "name": "C01",
+            "hosts" :
+            [
+                {
+                    "name": "H01",
+                    "cpu":
+                    {
+                        "coreCount": 64,
+                        "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_50_big_BE.json b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big_BE.json
new file mode 100644
index 00000000..d2c19861
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-base/src/test/resources/topologies/single_50_big_BE.json
@@ -0,0 +1,31 @@
+{
+    "clusters":
+    [
+        {
+            "name": "C01",
+            "hosts" :
+            [
+                {
+                    "name": "H01",
+                    "cpu":
+                    {
+                        "coreCount": 64,
+                        "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"
+            }
+        }
+    ]
+}