From 44215bd668c5fa3efe2f57fc577824478b00af57 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 1 Sep 2022 14:38:34 +0200
Subject: refactor(sim/compute): Re-implement using flow2

This change re-implements the OpenDC compute simulator framework using
the new flow2 framework for modelling multi-edge flow networks. The
re-implementation is written in Java and focusses on performance and
clean API surface.
---
 opendc-workflow/opendc-workflow-service/build.gradle.kts         | 1 +
 .../kotlin/org/opendc/workflow/service/WorkflowServiceTest.kt    | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'opendc-workflow')

diff --git a/opendc-workflow/opendc-workflow-service/build.gradle.kts b/opendc-workflow/opendc-workflow-service/build.gradle.kts
index 6908a5af..446c43a4 100644
--- a/opendc-workflow/opendc-workflow-service/build.gradle.kts
+++ b/opendc-workflow/opendc-workflow-service/build.gradle.kts
@@ -38,5 +38,6 @@ dependencies {
     testImplementation(projects.opendcExperiments.opendcExperimentsWorkflow)
     testImplementation(projects.opendcTrace.opendcTraceApi)
     testRuntimeOnly(projects.opendcTrace.opendcTraceGwf)
+    testRuntimeOnly(libs.log4j.core)
     testRuntimeOnly(libs.log4j.slf4j)
 }
diff --git a/opendc-workflow/opendc-workflow-service/src/test/kotlin/org/opendc/workflow/service/WorkflowServiceTest.kt b/opendc-workflow/opendc-workflow-service/src/test/kotlin/org/opendc/workflow/service/WorkflowServiceTest.kt
index 977f5677..c7123000 100644
--- a/opendc-workflow/opendc-workflow-service/src/test/kotlin/org/opendc/workflow/service/WorkflowServiceTest.kt
+++ b/opendc-workflow/opendc-workflow-service/src/test/kotlin/org/opendc/workflow/service/WorkflowServiceTest.kt
@@ -41,13 +41,12 @@ import org.opendc.experiments.workflow.WorkflowSchedulerSpec
 import org.opendc.experiments.workflow.replay
 import org.opendc.experiments.workflow.setupWorkflowService
 import org.opendc.experiments.workflow.toJobs
+import org.opendc.simulator.compute.SimPsuFactories
 import org.opendc.simulator.compute.model.MachineModel
 import org.opendc.simulator.compute.model.MemoryUnit
 import org.opendc.simulator.compute.model.ProcessingNode
 import org.opendc.simulator.compute.model.ProcessingUnit
-import org.opendc.simulator.compute.power.ConstantPowerModel
-import org.opendc.simulator.compute.power.SimplePowerDriver
-import org.opendc.simulator.flow.mux.FlowMultiplexerFactory
+import org.opendc.simulator.flow2.mux.FlowMultiplexerFactory
 import org.opendc.simulator.kotlin.runSimulation
 import org.opendc.trace.Trace
 import org.opendc.workflow.service.scheduler.job.NullJobAdmissionPolicy
@@ -120,7 +119,7 @@ internal class WorkflowServiceTest {
                 },
                 { assertEquals(0, metrics.tasksRunning, "Not all started tasks finished") },
                 { assertEquals(metrics.tasksSubmitted, metrics.tasksFinished, "Not all started tasks finished") },
-                { assertEquals(32649883L, clock.millis()) { "Total duration incorrect" } }
+                { assertEquals(46102707L, clock.millis()) { "Total duration incorrect" } }
             )
         }
     }
@@ -141,7 +140,7 @@ internal class WorkflowServiceTest {
             "host-$uid",
             emptyMap(),
             machineModel,
-            SimplePowerDriver(ConstantPowerModel(0.0)),
+            SimPsuFactories.noop(),
             FlowMultiplexerFactory.forwardingMultiplexer()
         )
     }
-- 
cgit v1.2.3