Merged experiment-scenario and experiment-base by moving ScenarioCli.…

…kt to experiment-base. Renamed the distribution of experiment-base to OpenDCScenarioRunner (#236)
atlarge-research · Jul 12, 2024 · a17e7ed · a17e7ed
1 parent b6153bb
commit a17e7ed
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 3,382 deletions.
diff --git a/opendc-experiments/opendc-experiments-base/build.gradle.kts b/opendc-experiments/opendc-experiments-base/build.gradle.kts
@@ -27,6 +27,7 @@ plugins {
     `kotlin-library-conventions`
     `testing-conventions`
     `jacoco-conventions`
+    distribution
     kotlin("plugin.serialization") version "1.9.22"
 }
 
@@ -35,6 +36,8 @@ dependencies {
     api(projects.opendcCompute.opendcComputeService)
     api(projects.opendcCompute.opendcComputeSimulator)
 
+    implementation(libs.clikt)
+
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
     implementation(libs.progressbar)
     implementation(project(mapOf("path" to ":opendc-simulator:opendc-simulator-core")))
@@ -48,3 +51,36 @@ dependencies {
     runtimeOnly(libs.log4j.core)
     runtimeOnly(libs.log4j.slf4j)
 }
+
+val createScenarioApp by tasks.creating(CreateStartScripts::class) {
+    dependsOn(tasks.jar)
+
+    applicationName = "OpenDCScenarioRunner"
+    mainClass.set("org.opendc.experiments.base.ScenarioCLI")
+    classpath = tasks.jar.get().outputs.files + configurations["runtimeClasspath"]
+    outputDir = project.buildDir.resolve("scripts")
+}
+
+// Create custom Scenario distribution
+distributions {
+    main {
+        distributionBaseName.set("OpenDCScenarioRunner")
+
+        contents {
+            from("README.md")
+            from("LICENSE.txt")
+            from("../../LICENSE.txt") {
+                rename { "LICENSE-OpenDC.txt" }
+            }
+
+            into("bin") {
+                from(createScenarioApp)
+            }
+
+            into("lib") {
+                from(tasks.jar)
+                from(configurations["runtimeClasspath"])
+            }
+        }
+    }
+}
diff --git a/...pendc/experiments/scenario/ScenarioCli.kt → ...dc/experiments/base/runner/ScenarioCli.kt b/...pendc/experiments/scenario/ScenarioCli.kt → ...dc/experiments/base/runner/ScenarioCli.kt
@@ -22,15 +22,14 @@
 
 @file:JvmName("ScenarioCli")
 
-package org.opendc.experiments.scenario
+package org.opendc.experiments.base.runner
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.defaultLazy
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.types.file
 import com.github.ajalt.clikt.parameters.types.int
-import org.opendc.experiments.base.runner.runScenarios
 import org.opendc.experiments.base.scenario.getScenarios
 import java.io.File
 

diff --git a/...xperiments/base/runner/ScenarioHelpers.kt → ...periments/base/runner/ScenarioReplayer.kt b/...xperiments/base/runner/ScenarioHelpers.kt → ...periments/base/runner/ScenarioReplayer.kt
diff --git a/opendc-experiments/opendc-experiments-scenario/build.gradle.kts b/opendc-experiments/opendc-experiments-scenario/build.gradle.kts
diff --git a/...riments-scenario/src/jmh/kotlin/org/opendc/experiments/greenifier/GreenifierBenchmarks.kt b/...riments-scenario/src/jmh/kotlin/org/opendc/experiments/greenifier/GreenifierBenchmarks.kt
diff --git a/opendc-experiments/opendc-experiments-scenario/src/jmh/resources/log4j2.xml b/opendc-experiments/opendc-experiments-scenario/src/jmh/resources/log4j2.xml
diff --git a/opendc-experiments/opendc-experiments-scenario/src/jmh/resources/topology.txt b/opendc-experiments/opendc-experiments-scenario/src/jmh/resources/topology.txt