diff options
Diffstat (limited to 'opendc-experiments/opendc-experiments-base')
2 files changed, 11 insertions, 12 deletions
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 cb4fdd46..5a37a0b9 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 @@ -28,7 +28,6 @@ import me.tongfei.progressbar.ProgressBarStyle import org.opendc.compute.carbon.CarbonTrace import org.opendc.compute.carbon.getCarbonTrace import org.opendc.compute.service.ComputeService -import org.opendc.compute.service.scheduler.ComputeSchedulerEnum import org.opendc.compute.service.scheduler.createComputeScheduler import org.opendc.compute.simulator.provisioner.Provisioner import org.opendc.compute.simulator.provisioner.registerComputeMonitor @@ -120,7 +119,7 @@ public fun runScenario( provisioner.runSteps( setupComputeService( serviceDomain, - { createComputeScheduler(ComputeSchedulerEnum.Mem, Random(it.seeder.nextLong())) }, + { createComputeScheduler(scenario.allocationPolicySpec.policyType, Random(it.seeder.nextLong())) }, ), setupHosts(serviceDomain, topology, optimize = true), ) 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 61716053..5ad1ecde 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 @@ -120,12 +120,12 @@ class ScenarioIntegrationTest { { assertEquals(0, monitor.serversActive, "All VMs should finish after a run") }, { assertEquals(0, monitor.attemptsFailure, "No VM should be unscheduled") }, { assertEquals(0, monitor.serversPending, "No VM should not be in the queue") }, - { assertEquals(36256553309, monitor.idleTime) { "Incorrect idle time" } }, - { assertEquals(10404414534, monitor.activeTime) { "Incorrect active time" } }, - { assertEquals(54402726811, monitor.stealTime) { "Incorrect steal time" } }, + { assertEquals(43795971955, monitor.idleTime) { "Incorrect idle time" } }, + { assertEquals(2864995687, monitor.activeTime) { "Incorrect active time" } }, + { assertEquals(148, monitor.stealTime) { "Incorrect steal time" } }, { assertEquals(0, monitor.lostTime) { "Incorrect lost time" } }, - { assertEquals(3.804398939214319E7, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, - { assertEquals(1.141307641744099E10, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, + { assertEquals(3.3017632018246904E7, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, + { assertEquals(9.905193072307465E9, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, ) } @@ -162,12 +162,12 @@ class ScenarioIntegrationTest { // Note that these values have been verified beforehand assertAll( - { assertEquals(873236440, monitor.idleTime) { "Idle time incorrect" } }, - { assertEquals(1719015528, monitor.activeTime) { "Active time incorrect" } }, - { assertEquals(8022269916, monitor.stealTime) { "Steal time incorrect" } }, + { assertEquals(1374591279, monitor.idleTime) { "Idle time incorrect" } }, + { assertEquals(1217660672, monitor.activeTime) { "Active time incorrect" } }, + { assertEquals(19, monitor.stealTime) { "Steal time incorrect" } }, { assertEquals(0, monitor.lostTime) { "Lost time incorrect" } }, - { assertEquals(2874229.394500494, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, - { assertEquals(8.622534568334692E8, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, + { assertEquals(2539987.394500494, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, + { assertEquals(7.619825262052509E8, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, ) } |