Updated workload schema (#360)

2 files changed, 10 insertions, 9 deletions

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 6c325349..14760a63 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
@@ -141,12 +141,13 @@ public suspend fun ComputeService.replay(
                 launch {
                     val task =
                         client.newTask(
+                            entry.id,
                             entry.name,
                             nature,
                             Duration.ofMillis(entry.duration),
                             entry.deadline,
                             client.newFlavor(
-                                entry.name,
+                                entry.id,
                                 entry.cpuCount,
                                 entry.memCapacity,
                                 entry.gpuCount,
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 e14a06cc..ce99a61d 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
@@ -101,7 +101,7 @@ public fun runScenario(
                     scalingPolicy,
                     scenario.workloadSpec.deferAll,
                 )
-            var workload = workloadLoader.sampleByLoad(scenario.workloadSpec.sampleFraction)
+            val workload = workloadLoader.sampleByLoad(scenario.workloadSpec.sampleFraction)
 
             val startTimeLong = workload.minOf { it.submissionTime }
             val startTime = Duration.ofMillis(startTimeLong)
@@ -143,7 +143,7 @@ public fun runScenario(
             service.setTasksExpected(workload.size)
             service.setMetricReader(provisioner.getMonitor())
 
-            var carbonModel: CarbonModel? = null
+            var carbonModel: CarbonModel?
             if (provisioner.registry.hasService(serviceDomain, CarbonModel::class.java)) {
                 carbonModel = provisioner.registry.resolve(serviceDomain, CarbonModel::class.java)!!
 
@@ -167,12 +167,12 @@ public fun runScenario(
                 }
             }
 
-            service.replay(
-                timeSource,
-                workload,
-                failureModelSpec = scenario.failureModelSpec,
-                seed = seed,
-            )
+//            service.replay(
+//                timeSource,
+//                workload,
+//                failureModelSpec = scenario.failureModelSpec,
+//                seed = seed,
+//            )
         }
     }