diff options
Diffstat (limited to 'opendc-experiments/opendc-experiments-base')
19 files changed, 36 insertions, 36 deletions
diff --git a/opendc-experiments/opendc-experiments-base/build.gradle.kts b/opendc-experiments/opendc-experiments-base/build.gradle.kts index d8921ffb..36073418 100644 --- a/opendc-experiments/opendc-experiments-base/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-base/build.gradle.kts @@ -52,8 +52,8 @@ dependencies { val createScenarioApp by tasks.creating(CreateStartScripts::class) { dependsOn(tasks.jar) - applicationName = "OpenDCScenarioRunner" - mainClass.set("org.opendc.experiments.base.runner.ScenarioCli") + applicationName = "OpenDCExperimentRunner" + mainClass.set("org.opendc.experiments.base.runner.ExperimentCli") classpath = tasks.jar.get().outputs.files + configurations["runtimeClasspath"] outputDir = project.buildDir.resolve("scripts") } @@ -61,7 +61,7 @@ val createScenarioApp by tasks.creating(CreateStartScripts::class) { // Create custom Scenario distribution distributions { main { - distributionBaseName.set("OpenDCScenarioRunner") + distributionBaseName.set("OpenDCExperimentRunner") contents { from("README.md") diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/ExperimentFactories.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/ExperimentFactories.kt index 524d4219..5d158ea3 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/ExperimentFactories.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/ExperimentFactories.kt @@ -20,10 +20,10 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario +package org.opendc.experiments.base.experiment -import org.opendc.experiments.base.scenario.specs.ExperimentSpec -import org.opendc.experiments.base.scenario.specs.ScenarioSpec +import org.opendc.experiments.base.experiment.specs.ExperimentSpec +import org.opendc.experiments.base.experiment.specs.ScenarioSpec import java.io.File private val experimentReader = ExperimentReader() diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/ExperimentReader.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/ExperimentReader.kt index 8ed60b08..12127644 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/ExperimentReader.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/ExperimentReader.kt @@ -20,13 +20,13 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario +package org.opendc.experiments.base.experiment import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream import org.opendc.compute.simulator.telemetry.parquet.ComputeExportConfig -import org.opendc.experiments.base.scenario.specs.ExperimentSpec +import org.opendc.experiments.base.experiment.specs.ExperimentSpec import java.io.File import java.io.InputStream import java.nio.file.Path diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/ExperimentWriter.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/ExperimentWriter.kt index 6afe6031..73331fe2 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/ExperimentWriter.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/ExperimentWriter.kt @@ -20,11 +20,11 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario +package org.opendc.experiments.base.experiment import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json -import org.opendc.experiments.base.scenario.specs.ScenarioSpec +import org.opendc.experiments.base.experiment.specs.ScenarioSpec import java.io.File /** diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/Scenario.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/Scenario.kt index e62669e4..a99bd061 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/Scenario.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/Scenario.kt @@ -20,15 +20,15 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario +package org.opendc.experiments.base.experiment import org.opendc.compute.simulator.telemetry.parquet.ComputeExportConfig -import org.opendc.experiments.base.scenario.specs.AllocationPolicySpec -import org.opendc.experiments.base.scenario.specs.CheckpointModelSpec -import org.opendc.experiments.base.scenario.specs.ExportModelSpec -import org.opendc.experiments.base.scenario.specs.FailureModelSpec -import org.opendc.experiments.base.scenario.specs.ScenarioTopologySpec -import org.opendc.experiments.base.scenario.specs.WorkloadSpec +import org.opendc.experiments.base.experiment.specs.AllocationPolicySpec +import org.opendc.experiments.base.experiment.specs.CheckpointModelSpec +import org.opendc.experiments.base.experiment.specs.ExportModelSpec +import org.opendc.experiments.base.experiment.specs.FailureModelSpec +import org.opendc.experiments.base.experiment.specs.ScenarioTopologySpec +import org.opendc.experiments.base.experiment.specs.WorkloadSpec /** * A data class representing a scenario for a set of experiments. diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/AllocationPolicySpec.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/AllocationPolicySpec.kt index ddc11a50..0bd3d476 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/AllocationPolicySpec.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/AllocationPolicySpec.kt @@ -20,7 +20,7 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario.specs +package org.opendc.experiments.base.experiment.specs import kotlinx.serialization.Serializable import org.opendc.compute.simulator.scheduler.ComputeSchedulerEnum diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/CheckpointModelSpec.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/CheckpointModelSpec.kt index ad0fba1d..47c3eb70 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/CheckpointModelSpec.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/CheckpointModelSpec.kt @@ -20,7 +20,7 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario.specs +package org.opendc.experiments.base.experiment.specs import kotlinx.serialization.Serializable diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/ExperimentSpec.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/ExperimentSpec.kt index 7805ed2b..6d8c8ebf 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/ExperimentSpec.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/ExperimentSpec.kt @@ -20,7 +20,7 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario.specs +package org.opendc.experiments.base.experiment.specs import kotlinx.serialization.Serializable import org.opendc.common.logger.infoNewLine @@ -50,14 +50,14 @@ public data class ExperimentSpec( val outputFolder: String = "output", val initialSeed: Int = 0, val runs: Int = 1, + val exportModels: Set<ExportModelSpec> = setOf(ExportModelSpec()), + val computeExportConfig: ComputeExportConfig = ComputeExportConfig.ALL_COLUMNS, + val maxNumFailures: Set<Int> = setOf(10), val topologies: Set<ScenarioTopologySpec>, val workloads: Set<WorkloadSpec>, val allocationPolicies: Set<AllocationPolicySpec> = setOf(AllocationPolicySpec()), - val exportModels: Set<ExportModelSpec> = setOf(ExportModelSpec()), val failureModels: Set<FailureModelSpec?> = setOf(null), val checkpointModels: Set<CheckpointModelSpec?> = setOf(null), - val computeExportConfig: ComputeExportConfig = ComputeExportConfig.ALL_COLUMNS, - val maxNumFailures: Set<Int> = setOf(10), ) { init { require(runs > 0) { "The number of runs should always be positive" } diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/ExportModelSpec.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/ExportModelSpec.kt index d51de27b..62f1ea4b 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/ExportModelSpec.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/ExportModelSpec.kt @@ -20,7 +20,7 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario.specs +package org.opendc.experiments.base.experiment.specs import kotlinx.serialization.Serializable diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/FailureModelSpec.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/FailureModelSpec.kt index c20b4467..520d7e3d 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/FailureModelSpec.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/FailureModelSpec.kt @@ -20,7 +20,7 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario.specs +package org.opendc.experiments.base.experiment.specs /* * Copyright (c) 2024 AtLarge Research diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/PowerModelSpec.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/PowerModelSpec.kt index f9679b26..a508d8c1 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/PowerModelSpec.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/PowerModelSpec.kt @@ -20,7 +20,7 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario.specs +package org.opendc.experiments.base.experiment.specs import kotlinx.serialization.Serializable diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/ScenarioSpec.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/ScenarioSpec.kt index b4f04c1c..b41eb37b 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/ScenarioSpec.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/ScenarioSpec.kt @@ -20,7 +20,7 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario.specs +package org.opendc.experiments.base.experiment.specs import kotlinx.serialization.Serializable import org.opendc.compute.simulator.telemetry.parquet.ComputeExportConfig diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/ScenarioTopologySpec.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/ScenarioTopologySpec.kt index feaca0c6..02c40af4 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/ScenarioTopologySpec.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/ScenarioTopologySpec.kt @@ -20,7 +20,7 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario.specs +package org.opendc.experiments.base.experiment.specs import kotlinx.serialization.Serializable import java.io.File diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/WorkloadSpec.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/WorkloadSpec.kt index 956e97f1..7f34c508 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/scenario/specs/WorkloadSpec.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/WorkloadSpec.kt @@ -20,7 +20,7 @@ * SOFTWARE. */ -package org.opendc.experiments.base.scenario.specs +package org.opendc.experiments.base.experiment.specs import kotlinx.serialization.Serializable import org.opendc.compute.workload.ComputeWorkload 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 28ebe45c..e067bf45 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 @@ -30,7 +30,7 @@ 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.scenario.getExperiment +import org.opendc.experiments.base.experiment.getExperiment import java.io.File /** diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentRunner.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentRunner.kt index 076cfb9f..0b45806b 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentRunner.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ExperimentRunner.kt @@ -22,7 +22,7 @@ package org.opendc.experiments.base.runner -import org.opendc.experiments.base.scenario.Scenario +import org.opendc.experiments.base.experiment.Scenario import java.util.concurrent.ForkJoinPool /** diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioReplayer.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioReplayer.kt index c82e2557..a0263e38 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioReplayer.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioReplayer.kt @@ -35,8 +35,8 @@ import org.opendc.compute.simulator.TaskWatcher import org.opendc.compute.simulator.service.ComputeService import org.opendc.compute.simulator.service.ServiceTask import org.opendc.compute.workload.Task -import org.opendc.experiments.base.scenario.specs.FailureModelSpec -import org.opendc.experiments.base.scenario.specs.createFailureModel +import org.opendc.experiments.base.experiment.specs.FailureModelSpec +import org.opendc.experiments.base.experiment.specs.createFailureModel import java.time.InstantSource import java.util.Random import kotlin.coroutines.coroutineContext 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 d525e066..4d6069e4 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 @@ -33,8 +33,8 @@ import org.opendc.compute.simulator.service.ComputeService import org.opendc.compute.simulator.telemetry.parquet.ParquetComputeMonitor import org.opendc.compute.topology.clusterTopology import org.opendc.compute.workload.ComputeWorkloadLoader -import org.opendc.experiments.base.scenario.Scenario -import org.opendc.experiments.base.scenario.specs.getWorkloadType +import org.opendc.experiments.base.experiment.Scenario +import org.opendc.experiments.base.experiment.specs.getWorkloadType import org.opendc.simulator.kotlin.runSimulation import java.io.File import java.time.Duration diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt index 9fa1a09a..132ed7b5 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt +++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt @@ -45,8 +45,8 @@ import org.opendc.compute.workload.ComputeWorkloadLoader import org.opendc.compute.workload.Task import org.opendc.compute.workload.sampleByLoad import org.opendc.compute.workload.trace +import org.opendc.experiments.base.experiment.specs.TraceBasedFailureModelSpec import org.opendc.experiments.base.runner.replay -import org.opendc.experiments.base.scenario.specs.TraceBasedFailureModelSpec import org.opendc.simulator.kotlin.runSimulation import java.io.File import java.util.Random |