From 7511fb768fab68d542adf5bbfb15e32300156c7e Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Wed, 30 Oct 2024 17:35:06 +0100 Subject: Added power sources to OpenDC (#258) * Added power sources to OpenDC. In the current form each Cluster has a single power source that is connected to all hosts in that cluster * Added power sources to OpenDC. In the current form each Cluster has a single power source that is connected to all hosts in that cluster * Ran spotless Kotlin and Java --- .../src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'opendc-web/opendc-web-runner') 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 70152b2c..ca42f566 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 @@ -31,7 +31,9 @@ import org.opendc.compute.simulator.provisioner.setupComputeService import org.opendc.compute.simulator.provisioner.setupHosts import org.opendc.compute.simulator.scheduler.createComputeScheduler import org.opendc.compute.simulator.service.ComputeService +import org.opendc.compute.topology.specs.ClusterSpec import org.opendc.compute.topology.specs.HostSpec +import org.opendc.compute.topology.specs.PowerSourceSpec import org.opendc.compute.workload.ComputeWorkloadLoader import org.opendc.compute.workload.sampleByLoad import org.opendc.compute.workload.trace @@ -233,7 +235,7 @@ public class OpenDCRunner( private inner class SimulationTask( private val scenario: Scenario, private val repeat: Int, - private val topology: List, + private val topologyHosts: List, ) : RecursiveTask() { override fun compute(): WebComputeMonitor.Results { val monitor = WebComputeMonitor() @@ -262,6 +264,13 @@ public class OpenDCRunner( val scenario = scenario + val powerSourceSpec = + PowerSourceSpec( + UUID(0, 0), + totalPower = Long.MAX_VALUE, + ) + val topology = listOf(ClusterSpec("cluster", topologyHosts, powerSourceSpec)) + Provisioner(dispatcher, seed).use { provisioner -> provisioner.runSteps( setupComputeService( -- cgit v1.2.3