From 3363df4c72a064e590ca98f8e01832cfa4e15a3f Mon Sep 17 00:00:00 2001
From: Dante Niewenhuis <d.niewenhuis@hotmail.com>
Date: Tue, 27 Aug 2024 13:48:46 +0200
Subject: Renamed input files and internally server is changed to task (#246)

* Updated SimTrace to use a single ArrayDeque instead of three separate lists for deadline, cpuUsage, and coreCount

* Renamed input files to tasks.parquet and fragments.parquet. Renamed server to task. OpenDC nows exports tasks.parquet instead of server.parquet
---
 .../org/opendc/compute/simulator/SimHostTest.kt    | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

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

diff --git a/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimHostTest.kt b/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimHostTest.kt
index 8c2ffd0c..ec3bf225 100644
--- a/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimHostTest.kt
+++ b/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimHostTest.kt
@@ -31,9 +31,9 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertAll
 import org.opendc.compute.api.Flavor
 import org.opendc.compute.api.Image
-import org.opendc.compute.api.Server
-import org.opendc.compute.api.ServerState
-import org.opendc.compute.api.ServerWatcher
+import org.opendc.compute.api.Task
+import org.opendc.compute.api.TaskState
+import org.opendc.compute.api.TaskWatcher
 import org.opendc.compute.service.driver.Host
 import org.opendc.compute.service.driver.HostListener
 import org.opendc.simulator.compute.SimBareMetalMachine
@@ -119,16 +119,16 @@ internal class SimHostTest {
 
                         override fun onStateChanged(
                             host: Host,
-                            server: Server,
-                            newState: ServerState,
+                            task: Task,
+                            newState: TaskState,
                         ) {
-                            if (newState == ServerState.TERMINATED && ++finished == 1) {
+                            if (newState == TaskState.TERMINATED && ++finished == 1) {
                                 cont.resume(Unit)
                             }
                         }
                     },
                 )
-                val server = MockServer(UUID.randomUUID(), "a", flavor, vmImage)
+                val server = MockTask(UUID.randomUUID(), "a", flavor, vmImage)
                 host.spawn(server)
                 host.start(server)
             }
@@ -211,18 +211,18 @@ internal class SimHostTest {
 
                             override fun onStateChanged(
                                 host: Host,
-                                server: Server,
-                                newState: ServerState,
+                                task: Task,
+                                newState: TaskState,
                             ) {
-                                if (newState == ServerState.TERMINATED && ++finished == 2) {
+                                if (newState == TaskState.TERMINATED && ++finished == 2) {
                                     cont.resume(Unit)
                                 }
                             }
                         },
                     )
-                    val serverA = MockServer(UUID.randomUUID(), "a", flavor, vmImageA)
+                    val serverA = MockTask(UUID.randomUUID(), "a", flavor, vmImageA)
                     host.spawn(serverA)
-                    val serverB = MockServer(UUID.randomUUID(), "b", flavor, vmImageB)
+                    val serverB = MockTask(UUID.randomUUID(), "b", flavor, vmImageB)
                     host.spawn(serverB)
 
                     host.start(serverA)
@@ -282,7 +282,7 @@ internal class SimHostTest {
                     ),
                 )
             val flavor = MockFlavor(2, 0)
-            val server = MockServer(UUID.randomUUID(), "a", flavor, image)
+            val server = MockTask(UUID.randomUUID(), "a", flavor, image)
 
             coroutineScope {
                 host.spawn(server)
@@ -297,10 +297,10 @@ internal class SimHostTest {
                         object : HostListener {
                             override fun onStateChanged(
                                 host: Host,
-                                server: Server,
-                                newState: ServerState,
+                                task: Task,
+                                newState: TaskState,
                             ) {
-                                if (newState == ServerState.TERMINATED) {
+                                if (newState == TaskState.TERMINATED) {
                                     cont.resume(Unit)
                                 }
                             }
@@ -360,17 +360,17 @@ internal class SimHostTest {
         }
     }
 
-    private class MockServer(
+    private class MockTask(
         override val uid: UUID,
         override val name: String,
         override val flavor: Flavor,
         override val image: Image,
-    ) : Server {
+    ) : Task {
         override val labels: Map<String, String> = emptyMap()
 
         override val meta: Map<String, Any> = emptyMap()
 
-        override val state: ServerState = ServerState.TERMINATED
+        override val state: TaskState = TaskState.TERMINATED
 
         override val launchedAt: Instant? = null
 
@@ -380,9 +380,9 @@ internal class SimHostTest {
 
         override fun delete() {}
 
-        override fun watch(watcher: ServerWatcher) {}
+        override fun watch(watcher: TaskWatcher) {}
 
-        override fun unwatch(watcher: ServerWatcher) {}
+        override fun unwatch(watcher: TaskWatcher) {}
 
         override fun reload() {}
     }
-- 
cgit v1.2.3