compute: Remove use of bare-metal provisioning from compute module

This change removes the usage of bare-metal provisioning from the OpenDC
Compute module. This significantly simplifies the experiment setup.

1 files changed, 14 insertions, 14 deletions

diff --git a/simulator/opendc-experiments/opendc-experiments-sc18/src/main/kotlin/org/opendc/experiments/sc18/UnderspecificationExperiment.kt b/simulator/opendc-experiments/opendc-experiments-sc18/src/main/kotlin/org/opendc/experiments/sc18/UnderspecificationExperiment.kt
index 7b9d70ed..57d1a4a0 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc18/src/main/kotlin/org/opendc/experiments/sc18/UnderspecificationExperiment.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc18/src/main/kotlin/org/opendc/experiments/sc18/UnderspecificationExperiment.kt
@@ -26,12 +26,11 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.test.TestCoroutineScope
 import org.opendc.compute.service.ComputeService
 import org.opendc.compute.service.scheduler.NumberOfActiveServersAllocationPolicy
-import org.opendc.compute.simulator.SimHostProvisioner
+import org.opendc.compute.simulator.SimHost
 import org.opendc.format.environment.sc18.Sc18EnvironmentReader
 import org.opendc.format.trace.gwf.GwfTraceReader
 import org.opendc.harness.dsl.Experiment
 import org.opendc.harness.dsl.anyOf
-import org.opendc.metal.service.ProvisioningService
 import org.opendc.simulator.compute.SimSpaceSharedHypervisorProvider
 import org.opendc.simulator.utils.DelayControllerClockAdapter
 import org.opendc.trace.core.EventTracer
@@ -84,16 +83,20 @@ public class UnderspecificationExperiment : Experiment("underspecification") {
         }
 
         testScope.launch {
-            val environment = Sc18EnvironmentReader(FileInputStream(File(environment)))
-                .use { it.construct(testScope, clock) }
+            val hosts = Sc18EnvironmentReader(FileInputStream(File(environment)))
+                .use { it.read() }
+                .map { def ->
+                    SimHost(
+                        def.uid,
+                        def.name,
+                        def.model,
+                        def.meta,
+                        testScope.coroutineContext,
+                        clock,
+                        SimSpaceSharedHypervisorProvider()
+                    )
+                }
 
-            val bareMetal = environment.platforms[0].zones[0].services[ProvisioningService]
-
-            // Wait for the bare metal nodes to be spawned
-            delay(10)
-
-            val provisioner = SimHostProvisioner(testScope.coroutineContext, bareMetal, SimSpaceSharedHypervisorProvider())
-            val hosts = provisioner.provisionAll()
             val compute = ComputeService(
                 testScope.coroutineContext,
                 clock,
@@ -103,9 +106,6 @@ public class UnderspecificationExperiment : Experiment("underspecification") {
 
             hosts.forEach { compute.addHost(it) }
 
-            // Wait for the hypervisors to be spawned
-            delay(10)
-
             val scheduler = StageWorkflowService(
                 testScope,
                 clock,