Merge branch '2.x-azure' into '2.x'

Add Azure trace reader

See merge request opendc/opendc-simulator!68

1 files changed, 3 insertions, 3 deletions

diff --git a/opendc/opendc-experiments-sc20/src/test/kotlin/com/atlarge/opendc/experiments/sc20/Sc20IntegrationTest.kt b/opendc/opendc-experiments-sc20/src/test/kotlin/com/atlarge/opendc/experiments/sc20/Sc20IntegrationTest.kt
index 68c2cbc5..5ecf7605 100644
--- a/opendc/opendc-experiments-sc20/src/test/kotlin/com/atlarge/opendc/experiments/sc20/Sc20IntegrationTest.kt
+++ b/opendc/opendc-experiments-sc20/src/test/kotlin/com/atlarge/opendc/experiments/sc20/Sc20IntegrationTest.kt
@@ -145,8 +145,8 @@ class Sc20IntegrationTest {
         assertEquals(50, scheduler.submittedVms, "The trace contains 50 VMs")
         assertEquals(50, scheduler.finishedVms, "All VMs should finish after a run")
         assertEquals(207379117949, monitor.totalRequestedBurst)
-        assertEquals(207102919834, monitor.totalGrantedBurst)
-        assertEquals(276198896, monitor.totalOvercommissionedBurst)
+        assertEquals(203388071813, monitor.totalGrantedBurst)
+        assertEquals(3991046136, monitor.totalOvercommissionedBurst)
         assertEquals(0, monitor.totalInterferedBurst)
     }
 
@@ -204,7 +204,7 @@ class Sc20IntegrationTest {
      */
     private fun createTestTraceReader(fraction: Double = 1.0, seed: Int = 0): TraceReader<VmWorkload> {
         return Sc20ParquetTraceReader(
-            Sc20RawParquetTraceReader(File("src/test/resources/trace")),
+            listOf(Sc20RawParquetTraceReader(File("src/test/resources/trace"))),
             emptyMap(),
             Workload("test", fraction),
             seed