From 5864cbcbfe2eb8c36ca05c3a39c7e5916aeecaec Mon Sep 17 00:00:00 2001
From: Dante Niewenhuis <d.niewenhuis@hotmail.com>
Date: Tue, 5 Mar 2024 13:23:57 +0100
Subject: Updated package versions, updated web server tests. (#207)

* Updated all package versions including kotlin. Updated all web-server tests to run.

* Changed the java version of the tests. OpenDC now only supports java 19.

* small update

* test update

* new update

* updated docker version to 19

* updated docker version to 19
---
 .../experiments/base/portfolio/model/Scenario.kt   |  2 +-
 .../opendc/experiments/base/runner/TraceHelpers.kt | 34 ++++++++++++----------
 2 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'opendc-experiments/opendc-experiments-base/src/main/kotlin')

diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/portfolio/model/Scenario.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/portfolio/model/Scenario.kt
index 66fc76e4..cf0f5320 100644
--- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/portfolio/model/Scenario.kt
+++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/portfolio/model/Scenario.kt
@@ -36,5 +36,5 @@ public data class Scenario(
     val workload: Workload,
     val operationalPhenomena: OperationalPhenomena,
     val allocationPolicy: String,
-    val partitions: Map<String, String> = emptyMap()
+    val partitions: Map<String, String> = emptyMap(),
 )
diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/TraceHelpers.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/TraceHelpers.kt
index 2afbd8a5..ddfa35cc 100644
--- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/TraceHelpers.kt
+++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/TraceHelpers.kt
@@ -49,19 +49,22 @@ public class RunningServerWatcher : ServerWatcher {
     // TODO: make this changeable
     private val unlockStates: List<ServerState> = listOf(ServerState.TERMINATED, ServerState.ERROR, ServerState.DELETED)
 
-    private val _mutex: Mutex = Mutex()
+    private val mutex: Mutex = Mutex()
 
     public suspend fun lock() {
-        _mutex.lock()
+        mutex.lock()
     }
 
     public suspend fun wait() {
         this.lock()
     }
 
-    override fun onStateChanged(server: Server, newState: ServerState) {
+    override fun onStateChanged(
+        server: Server,
+        newState: ServerState,
+    ) {
         if (unlockStates.contains(newState)) {
-            _mutex.unlock()
+            mutex.unlock()
         }
     }
 }
@@ -82,7 +85,7 @@ public suspend fun ComputeService.replay(
     seed: Long,
     submitImmediately: Boolean = false,
     failureModel: FailureModel? = null,
-    interference: Boolean = false
+    interference: Boolean = false,
 ) {
     val injector = failureModel?.createInjector(coroutineContext, clock, this, Random(seed))
     val client = newClient()
@@ -123,17 +126,18 @@ public suspend fun ComputeService.replay(
                 }
 
                 launch {
-                    val server = client.newServer(
-                        entry.name,
-                        image,
-                        client.newFlavor(
+                    val server =
+                        client.newServer(
                             entry.name,
-                            entry.cpuCount,
-                            entry.memCapacity,
-                            meta = if (entry.cpuCapacity > 0.0) mapOf("cpu-capacity" to entry.cpuCapacity) else emptyMap()
-                        ),
-                        meta = meta
-                    )
+                            image,
+                            client.newFlavor(
+                                entry.name,
+                                entry.cpuCount,
+                                entry.memCapacity,
+                                meta = if (entry.cpuCapacity > 0.0) mapOf("cpu-capacity" to entry.cpuCapacity) else emptyMap(),
+                            ),
+                            meta = meta,
+                        )
 
                     val serverWatcher = RunningServerWatcher()
                     serverWatcher.lock()
-- 
cgit v1.2.3