From e85a11645a2262e2e6fd1e3570ad001eb805c85f Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 2 Mar 2021 21:15:38 +0100
Subject: compute: Separate cloud compute layer from bare-metal layer

This change separates the cloud compute layer in OpenDC (e.g., Server)
from the bare-metal layer (e.g., Node), such that Node and
BareMetalDriver are unaware of the existence of Server and co.
---
 .../compute/simulator/SimBareMetalDriverTest.kt     | 21 ++++++++++++---------
 .../compute/simulator/SimProvisioningServiceTest.kt |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'simulator/opendc-compute/opendc-compute-simulator/src/test')

diff --git a/simulator/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimBareMetalDriverTest.kt b/simulator/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimBareMetalDriverTest.kt
index 03981feb..3ca9a0a3 100644
--- a/simulator/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimBareMetalDriverTest.kt
+++ b/simulator/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimBareMetalDriverTest.kt
@@ -30,9 +30,10 @@ import kotlinx.coroutines.withContext
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.opendc.compute.core.ServerEvent
-import org.opendc.compute.core.ServerState
+import org.junit.jupiter.api.assertAll
 import org.opendc.compute.core.image.Image
+import org.opendc.compute.core.metal.NodeEvent
+import org.opendc.compute.core.metal.NodeState
 import org.opendc.simulator.compute.SimMachineModel
 import org.opendc.simulator.compute.model.MemoryUnit
 import org.opendc.simulator.compute.model.ProcessingNode
@@ -60,7 +61,7 @@ internal class SimBareMetalDriverTest {
         val testScope = TestCoroutineScope()
         val clock = DelayControllerClockAdapter(testScope)
 
-        var finalState: ServerState = ServerState.BUILD
+        var finalState: NodeState = NodeState.UNKNOWN
         var finalTime = 0L
 
         testScope.launch {
@@ -70,11 +71,11 @@ internal class SimBareMetalDriverTest {
             withContext(coroutineContext) {
                 driver.init()
                 driver.setImage(image)
-                val server = driver.start().server!!
-                server.events.collect { event ->
+                val node = driver.start()
+                node.events.collect { event ->
                     when (event) {
-                        is ServerEvent.StateChanged -> {
-                            finalState = event.server.state
+                        is NodeEvent.StateChanged -> {
+                            finalState = event.node.state
                             finalTime = clock.millis()
                         }
                     }
@@ -83,7 +84,9 @@ internal class SimBareMetalDriverTest {
         }
 
         testScope.advanceUntilIdle()
-        assertEquals(ServerState.SHUTOFF, finalState)
-        assertEquals(501, finalTime)
+        assertAll(
+            { assertEquals(NodeState.SHUTOFF, finalState) },
+            { assertEquals(501, finalTime) }
+        )
     }
 }
diff --git a/simulator/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimProvisioningServiceTest.kt b/simulator/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimProvisioningServiceTest.kt
index dad31298..eb46c335 100644
--- a/simulator/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimProvisioningServiceTest.kt
+++ b/simulator/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimProvisioningServiceTest.kt
@@ -73,7 +73,7 @@ internal class SimProvisioningServiceTest {
             delay(5)
             val nodes = provisioner.nodes()
             val node = provisioner.deploy(nodes.first(), image)
-            node.server!!.events.collect { println(it) }
+            node.events.collect { println(it) }
         }
 
         testScope.advanceUntilIdle()
-- 
cgit v1.2.3