All simulation are now run with a single CPU and single MemoryUnit. multi CPUs are combined into one. This is for performance and explainability. (#255)

2 files changed, 29 insertions, 29 deletions

diff --git a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/ComputeServiceTest.kt b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/ComputeServiceTest.kt
index fa5b775e..eb686faf 100644
--- a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/ComputeServiceTest.kt
+++ b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/ComputeServiceTest.kt
@@ -136,7 +136,7 @@ internal class ComputeServiceTest {
         scope.runSimulation {
             val host = mockk<Host>(relaxUnitFun = true)
 
-            every { host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+            every { host.model } returns HostModel(4 * 2600.0, 4, 2048)
             every { host.state } returns HostState.UP
 
             assertEquals(emptySet<Host>(), service.hosts)
@@ -157,7 +157,7 @@ internal class ComputeServiceTest {
         scope.runSimulation {
             val host = mockk<Host>(relaxUnitFun = true)
 
-            every { host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+            every { host.model } returns HostModel(4 * 2600.0, 4, 2048)
             every { host.state } returns HostState.DOWN
 
             assertEquals(emptySet<Host>(), service.hosts)
@@ -230,7 +230,7 @@ internal class ComputeServiceTest {
         scope.runSimulation {
             val host = mockk<Host>(relaxUnitFun = true)
 
-            every { host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+            every { host.model } returns HostModel(4 * 2600.0, 4, 2048)
             every { host.state } returns HostState.UP
             every { host.canFit(any()) } returns false
 
@@ -256,7 +256,7 @@ internal class ComputeServiceTest {
             val listeners = mutableListOf<HostListener>()
 
             every { host.uid } returns UUID.randomUUID()
-            every { host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+            every { host.model } returns HostModel(4 * 2600.0, 4, 2048)
             every { host.state } returns HostState.DOWN
             every { host.addListener(any()) } answers { listeners.add(it.invocation.args[0] as HostListener) }
             every { host.canFit(any()) } returns false
@@ -288,7 +288,7 @@ internal class ComputeServiceTest {
             val listeners = mutableListOf<HostListener>()
 
             every { host.uid } returns UUID.randomUUID()
-            every { host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+            every { host.model } returns HostModel(4 * 2600.0, 4, 2048)
             every { host.state } returns HostState.UP
             every { host.addListener(any()) } answers { listeners.add(it.invocation.args[0] as HostListener) }
             every { host.canFit(any()) } returns false
@@ -320,7 +320,7 @@ internal class ComputeServiceTest {
             val listeners = mutableListOf<HostListener>()
 
             every { host.uid } returns UUID.randomUUID()
-            every { host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+            every { host.model } returns HostModel(4 * 2600.0, 4, 2048)
             every { host.state } returns HostState.UP
             every { host.canFit(any()) } returns true
             every { host.addListener(any()) } answers { listeners.add(it.invocation.args[0] as HostListener) }
@@ -364,7 +364,7 @@ internal class ComputeServiceTest {
             val listeners = mutableListOf<HostListener>()
 
             every { host.uid } returns UUID.randomUUID()
-            every { host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+            every { host.model } returns HostModel(4 * 2600.0, 4, 2048)
             every { host.state } returns HostState.UP
             every { host.canFit(any()) } returns true
             every { host.addListener(any()) } answers { listeners.add(it.invocation.args[0] as HostListener) }
diff --git a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/scheduler/FilterSchedulerTest.kt b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/scheduler/FilterSchedulerTest.kt
index 2478bf82..add10f8f 100644
--- a/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/scheduler/FilterSchedulerTest.kt
+++ b/opendc-compute/opendc-compute-service/src/test/kotlin/org/opendc/compute/service/scheduler/FilterSchedulerTest.kt
@@ -193,12 +193,12 @@ internal class FilterSchedulerTest {
 
         val hostA = mockk<HostView>()
         every { hostA.host.state } returns HostState.UP
-        every { hostA.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostA.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostA.availableMemory } returns 512
 
         val hostB = mockk<HostView>()
         every { hostB.host.state } returns HostState.UP
-        every { hostB.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostB.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostB.availableMemory } returns 2048
 
         scheduler.addHost(hostA)
@@ -221,7 +221,7 @@ internal class FilterSchedulerTest {
 
         val host = mockk<HostView>()
         every { host.host.state } returns HostState.UP
-        every { host.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { host.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { host.availableMemory } returns 2048
 
         scheduler.addHost(host)
@@ -243,12 +243,12 @@ internal class FilterSchedulerTest {
 
         val hostA = mockk<HostView>()
         every { hostA.host.state } returns HostState.UP
-        every { hostA.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostA.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostA.provisionedCores } returns 3
 
         val hostB = mockk<HostView>()
         every { hostB.host.state } returns HostState.UP
-        every { hostB.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostB.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostB.provisionedCores } returns 0
 
         scheduler.addHost(hostA)
@@ -271,7 +271,7 @@ internal class FilterSchedulerTest {
 
         val host = mockk<HostView>()
         every { host.host.state } returns HostState.UP
-        every { host.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { host.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { host.provisionedCores } returns 0
 
         scheduler.addHost(host)
@@ -294,13 +294,13 @@ internal class FilterSchedulerTest {
 
         val hostA = mockk<HostView>()
         every { hostA.host.state } returns HostState.UP
-        every { hostA.host.model } returns HostModel(8 * 2600.0, 1, 8, 2048)
+        every { hostA.host.model } returns HostModel(8 * 2600.0, 8, 2048)
         every { hostA.availableMemory } returns 512
         scheduler.addHost(hostA)
 
         val hostB = mockk<HostView>()
         every { hostB.host.state } returns HostState.UP
-        every { hostB.host.model } returns HostModel(4 * 3200.0, 1, 4, 2048)
+        every { hostB.host.model } returns HostModel(4 * 3200.0, 4, 2048)
         every { hostB.availableMemory } returns 512
 
         scheduler.addHost(hostB)
@@ -323,12 +323,12 @@ internal class FilterSchedulerTest {
 
         val hostA = mockk<HostView>()
         every { hostA.host.state } returns HostState.UP
-        every { hostA.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostA.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostA.instanceCount } returns 2
 
         val hostB = mockk<HostView>()
         every { hostB.host.state } returns HostState.UP
-        every { hostB.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostB.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostB.instanceCount } returns 0
 
         scheduler.addHost(hostA)
@@ -356,13 +356,13 @@ internal class FilterSchedulerTest {
 
         val hostA = mockk<HostView>()
         every { hostA.host.state } returns HostState.UP
-        every { hostA.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostA.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostA.host.instances } returns emptySet()
         every { hostA.provisionedCores } returns 3
 
         val hostB = mockk<HostView>()
         every { hostB.host.state } returns HostState.UP
-        every { hostB.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostB.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostB.host.instances } returns setOf(taskA)
         every { hostB.provisionedCores } returns 0
 
@@ -396,13 +396,13 @@ internal class FilterSchedulerTest {
 
         val hostA = mockk<HostView>()
         every { hostA.host.state } returns HostState.UP
-        every { hostA.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostA.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostA.host.instances } returns setOf(taskA)
         every { hostA.provisionedCores } returns 3
 
         val hostB = mockk<HostView>()
         every { hostB.host.state } returns HostState.UP
-        every { hostB.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostB.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostB.host.instances } returns emptySet()
         every { hostB.provisionedCores } returns 0
 
@@ -431,12 +431,12 @@ internal class FilterSchedulerTest {
 
         val hostA = mockk<HostView>()
         every { hostA.host.state } returns HostState.UP
-        every { hostA.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostA.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostA.availableMemory } returns 1024
 
         val hostB = mockk<HostView>()
         every { hostB.host.state } returns HostState.UP
-        every { hostB.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostB.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostB.availableMemory } returns 512
 
         scheduler.addHost(hostA)
@@ -460,12 +460,12 @@ internal class FilterSchedulerTest {
 
         val hostA = mockk<HostView>()
         every { hostA.host.state } returns HostState.UP
-        every { hostA.host.model } returns HostModel(12 * 2600.0, 1, 12, 2048)
+        every { hostA.host.model } returns HostModel(12 * 2600.0, 12, 2048)
         every { hostA.availableMemory } returns 1024
 
         val hostB = mockk<HostView>()
         every { hostB.host.state } returns HostState.UP
-        every { hostB.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostB.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostB.availableMemory } returns 512
 
         scheduler.addHost(hostA)
@@ -488,12 +488,12 @@ internal class FilterSchedulerTest {
 
         val hostA = mockk<HostView>()
         every { hostA.host.state } returns HostState.UP
-        every { hostA.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostA.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostA.provisionedCores } returns 2
 
         val hostB = mockk<HostView>()
         every { hostB.host.state } returns HostState.UP
-        every { hostB.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostB.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostB.provisionedCores } returns 0
 
         scheduler.addHost(hostA)
@@ -516,12 +516,12 @@ internal class FilterSchedulerTest {
 
         val hostA = mockk<HostView>()
         every { hostA.host.state } returns HostState.UP
-        every { hostA.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostA.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostA.instanceCount } returns 2
 
         val hostB = mockk<HostView>()
         every { hostB.host.state } returns HostState.UP
-        every { hostB.host.model } returns HostModel(4 * 2600.0, 1, 4, 2048)
+        every { hostB.host.model } returns HostModel(4 * 2600.0, 4, 2048)
         every { hostB.instanceCount } returns 0
 
         scheduler.addHost(hostA)