2 files changed, 18 insertions, 2 deletions
diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/FailureModelSpec.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/FailureModelSpec.kt
index 520d7e3d..4a1add59 100644
--- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/FailureModelSpec.kt
+++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/experiment/specs/FailureModelSpec.kt
@@ -78,6 +78,12 @@ public sealed interface FailureModelSpec {
     public var name: String
 }
 
+@Serializable
+@SerialName("no")
+public data class NoFailureModel(
+    override var name: String = "no failure model",
+) : FailureModelSpec
+
 /**
  * A failure model spec for failure models based on a failure trace.
  *
@@ -87,11 +93,15 @@ public sealed interface FailureModelSpec {
 @SerialName("trace-based")
 public data class TraceBasedFailureModelSpec(
     public val pathToFile: String,
+    public val startPoint: Double = 0.0,
+    public val repeat: Boolean = true,
 ) : FailureModelSpec {
     override var name: String = File(pathToFile).nameWithoutExtension
 
     init {
         require(File(pathToFile).exists()) { "Path to file $pathToFile does not exist" }
+        require(startPoint < 1.0) { "Starting point must be smaller than 1.0" }
+        require(startPoint >= 0.0) { "Starting point must be equal or larger than 0.0" }
     }
 }
 
@@ -267,7 +277,7 @@ public fun createFailureModel(
     random: java.util.random.RandomGenerator,
     failureModel: TraceBasedFailureModelSpec,
 ): FailureModel {
-    return TraceBasedFailureModel(context, clock, service, random, failureModel.pathToFile)
+    return TraceBasedFailureModel(context, clock, service, random, failureModel.pathToFile, failureModel.startPoint, failureModel.repeat)
 }
 
 /**
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 bffd9624..abf16fef 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
@@ -135,7 +135,11 @@ class ScenarioIntegrationTest {
             val workload = createTestWorkload("single_task", 1.0, seed)
             val topology = createTopology("single.json")
             val monitor = monitor
-            val failureModelSpec = TraceBasedFailureModelSpec("src/test/resources/failureTraces/single_failure.parquet")
+            val failureModelSpec =
+                TraceBasedFailureModelSpec(
+                    "src/test/resources/failureTraces/single_failure.parquet",
+                    repeat = false,
+                )
 
             Provisioner(dispatcher, seed).use { provisioner ->
                 provisioner.runSteps(
@@ -145,6 +149,8 @@ class ScenarioIntegrationTest {
                 )
 
                 val service = provisioner.registry.resolve("compute.opendc.org", ComputeService::class.java)!!
+                service.setTasksExpected(workload.size)
+
                 service.replay(timeSource, workload, failureModelSpec = failureModelSpec, seed = seed)
             }