Merge branch 'test/integration-test' into '2.x'

Add integration tests for SC20 experiments

Closes #54

See merge request opendc/opendc-simulator!63

3 files changed, 9 insertions, 8 deletions

diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
index 2ef0db97..e34ee2dc 100644
--- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
+++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
@@ -38,9 +38,9 @@ import com.atlarge.opendc.core.Platform
 import com.atlarge.opendc.core.Zone
 import com.atlarge.opendc.core.services.ServiceRegistry
 import com.atlarge.opendc.format.environment.EnvironmentReader
-import java.io.BufferedReader
 import java.io.File
-import java.io.FileReader
+import java.io.FileInputStream
+import java.io.InputStream
 import java.util.Random
 import java.util.UUID
 
@@ -50,8 +50,11 @@ import java.util.UUID
  * @param environmentFile The file describing the physical cluster.
  */
 class Sc20ClusterEnvironmentReader(
-    private val environmentFile: File
+    private val input: InputStream
 ) : EnvironmentReader {
+
+    constructor(file: File) : this(FileInputStream(file))
+
     @Suppress("BlockingMethodInNonBlockingContext")
     override suspend fun construct(dom: Domain): Environment {
         var clusterIdCol = 0
@@ -70,7 +73,7 @@ class Sc20ClusterEnvironmentReader(
         val nodes = mutableListOf<SimpleBareMetalDriver>()
         val random = Random(0)
 
-        BufferedReader(FileReader(environmentFile)).use { reader ->
+        input.bufferedReader().use { reader ->
             reader.lineSequence()
                 .filter { line ->
                     // Ignore comments in the file
diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/bitbrains/BitbrainsTraceReader.kt
index fe1049d9..5220af9b 100644
--- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt
+++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/bitbrains/BitbrainsTraceReader.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.atlarge.opendc.format.trace.vm
+package com.atlarge.opendc.format.trace.bitbrains
 
 import com.atlarge.opendc.compute.core.image.FlopsHistoryFragment
 import com.atlarge.opendc.compute.core.image.VmImage
@@ -43,7 +43,7 @@ import java.util.UUID
  * @param traceDirectory The directory of the traces.
  * @param performanceInterferenceModel The performance model covering the workload in the VM trace.
  */
-class VmTraceReader(
+class BitbrainsTraceReader(
     traceDirectory: File,
     performanceInterferenceModel: PerformanceInterferenceModel
 ) : TraceReader<VmWorkload> {
diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt
index 2e2159ba..c53cd569 100644
--- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt
+++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt
@@ -117,7 +117,6 @@ class Sc20TraceReader(
                         reader.lineSequence()
                             .chunked(128)
                             .forEach { lines ->
-                                // val res = ArrayList<FlopsHistoryFragment>(lines.size)
                                 for (line in lines) {
                                     // Ignore comments in the trace
                                     if (line.startsWith("#") || line.isBlank()) {
@@ -149,7 +148,6 @@ class Sc20TraceReader(
                                         fragment
                                     }
                                 }
-                                // yieldAll(res)
                             }
 
                         if (last != null) {