summaryrefslogtreecommitdiff
path: root/opendc-web/opendc-web-runner/src/main/kotlin
diff options
context:
space:
mode:
authorDante Niewenhuis <d.niewenhuis@hotmail.com>2024-03-19 20:26:04 +0100
committerGitHub <noreply@github.com>2024-03-19 20:26:04 +0100
commitdff30fa60809c018101052f395b09cf17cb83ccb (patch)
tree2c5f67b9424547061aaa0c6b6b85af9a125ec263 /opendc-web/opendc-web-runner/src/main/kotlin
parent960b3d8a13c67ac4b7f479d5764b0b618fc9ea09 (diff)
Scenario and Portfolio update (#209)
* Initial commit * Implemented a new systems of defining and running scenarios / portfolios. Scenarios and Portfolios can now be defined using JSON files similar to topologies. This allows user to define experiments without changing any KotLin code. * Ran spotlessApply
Diffstat (limited to 'opendc-web/opendc-web-runner/src/main/kotlin')
-rw-r--r--opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt8
1 files changed, 4 insertions, 4 deletions
diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
index 92722bcc..0de3b7fc 100644
--- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
+++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt
@@ -25,7 +25,7 @@ package org.opendc.web.runner
import mu.KotlinLogging
import org.opendc.compute.service.ComputeService
import org.opendc.compute.service.scheduler.createComputeScheduler
-import org.opendc.compute.simulator.failure.grid5000
+import org.opendc.compute.simulator.failure.models.Grid5000
import org.opendc.compute.simulator.provisioner.Provisioner
import org.opendc.compute.simulator.provisioner.registerComputeMonitor
import org.opendc.compute.simulator.provisioner.setupComputeService
@@ -282,13 +282,13 @@ public class OpenDCRunner(
val phenomena = scenario.phenomena
val failureModel =
if (phenomena.failures) {
- grid5000(Duration.ofDays(7))
+ Grid5000(Duration.ofDays(7))
} else {
null
}
// Run workload trace
- service.replay(timeSource, vms, seed, failureModel = failureModel, interference = phenomena.interference)
+ service.replay(timeSource, vms, seed, failureModel = failureModel)
val serviceMetrics = service.getSchedulerStats()
logger.debug {
@@ -327,7 +327,7 @@ public class OpenDCRunner(
machine.cpus.flatMap { cpu ->
val cores = cpu.numberOfCores
val speed = cpu.clockRateMhz
- // TODO Remove hard coding of vendor
+ // TODO: Remove hard coding of vendor
val node = ProcessingNode("Intel", "amd64", cpu.name, cores)
List(cores) { coreId ->
ProcessingUnit(node, coreId, speed)