simulator: Remove generic resource constraint from resource model

This change removes the generic resource constraint (e.g., SimResource)
and replaces it by a simple capacity property. In the future, users
should handle the resource properties on a higher level.

This change simplifies compositions of consumers and providers by not
requiring a translation from resource to capacity.

1 files changed, 6 insertions, 6 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 612509de..a812490a 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,10 +143,10 @@ class CapelinIntegrationTest {
         assertAll(
             { assertEquals(50, scheduler.submittedVms, "The trace contains 50 VMs") },
             { assertEquals(50, scheduler.finishedVms, "All VMs should finish after a run") },
-            { assertEquals(1707144601723, monitor.totalRequestedBurst) },
-            { assertEquals(457798297997, monitor.totalGrantedBurst) },
-            { assertEquals(1236692477983, monitor.totalOvercommissionedBurst) },
-            { assertEquals(0, monitor.totalInterferedBurst) }
+            { assertEquals(1672916917970, monitor.totalRequestedBurst) { "Incorrect requested burst" } },
+            { assertEquals(435179794565, monitor.totalGrantedBurst) { "Incorrect granted burst" } },
+            { assertEquals(1236692477983, monitor.totalOvercommissionedBurst) { "Incorrect overcommitted burst" } },
+            { assertEquals(0, monitor.totalInterferedBurst) { "Incorrect interfered burst" } }
         )
     }
 
@@ -189,8 +189,8 @@ class CapelinIntegrationTest {
 
         // Note that these values have been verified beforehand
         assertAll(
-            { assertEquals(711464339925, monitor.totalRequestedBurst) { "Total requested work incorrect" } },
-            { assertEquals(175226294127, monitor.totalGrantedBurst) { "Total granted work incorrect" } },
+            { assertEquals(702636229989, monitor.totalRequestedBurst) { "Total requested work incorrect" } },
+            { assertEquals(172807361391, monitor.totalGrantedBurst) { "Total granted work incorrect" } },
             { assertEquals(528959213229, monitor.totalOvercommissionedBurst) { "Total overcommitted work incorrect" } },
             { assertEquals(0, monitor.totalInterferedBurst) { "Total interfered work incorrect" } }
         )