simulator: Re-design consumer interface to support capacity negotiation

This change re-designs the SimResourceConsumer interface to support in
the future capacity negotiation. This basically means that the consumer
will be informed directly when not enough capacity is available, instead
of after the deadline specified by the consumer.

1 files changed, 4 insertions, 4 deletions

diff --git a/simulator/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt b/simulator/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
index 59ce895f..7dae53be 100644
--- a/simulator/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
+++ b/simulator/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
@@ -143,8 +143,8 @@ class CapelinIntegrationTest {
         assertAll(
             { assertEquals(50, scheduler.submittedVms, "The trace contains 50 VMs") },
             { assertEquals(50, scheduler.finishedVms, "All VMs should finish after a run") },
-            { assertEquals(1707132711051, monitor.totalRequestedBurst) },
-            { assertEquals(457881474296, monitor.totalGrantedBurst) },
+            { assertEquals(1707144601723, monitor.totalRequestedBurst) },
+            { assertEquals(457893364971, monitor.totalGrantedBurst) },
             { assertEquals(1220323969993, monitor.totalOvercommissionedBurst) },
             { assertEquals(0, monitor.totalInterferedBurst) }
         )
@@ -189,8 +189,8 @@ class CapelinIntegrationTest {
 
         // Note that these values have been verified beforehand
         assertAll(
-            { assertEquals(711464322955, monitor.totalRequestedBurst) { "Total requested work incorrect" } },
-            { assertEquals(175226276978, monitor.totalGrantedBurst) { "Total granted work incorrect" } },
+            { assertEquals(711464339925, monitor.totalRequestedBurst) { "Total requested work incorrect" } },
+            { assertEquals(175226293948, monitor.totalGrantedBurst) { "Total granted work incorrect" } },
             { assertEquals(526858997740, monitor.totalOvercommissionedBurst) { "Total overcommitted work incorrect" } },
             { assertEquals(0, monitor.totalInterferedBurst) { "Total interfered work incorrect" } }
         )