diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-03-15 17:20:08 +0100 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-03-25 10:41:21 +0100 |
| commit | c9cd6bb12eee73562ed9078f01aa041c7f5ed8ae (patch) | |
| tree | a60e61a240d5c9c7ba5748321fd316c3e9644ddb /opendc/opendc-compute | |
| parent | 95c9ae8a7c4efae57caba9863dfc3e10df23c2fd (diff) | |
feat: Make FaultInjector more generic
Diffstat (limited to 'opendc/opendc-compute')
2 files changed, 7 insertions, 5 deletions
diff --git a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/metal/driver/SimpleBareMetalDriver.kt b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/metal/driver/SimpleBareMetalDriver.kt index fbc5c0ce..4fe8d740 100644 --- a/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/metal/driver/SimpleBareMetalDriver.kt +++ b/opendc/opendc-compute/src/main/kotlin/com/atlarge/opendc/compute/metal/driver/SimpleBareMetalDriver.kt @@ -43,8 +43,8 @@ import com.atlarge.opendc.compute.metal.monitor.NodeMonitor import com.atlarge.opendc.compute.metal.power.ConstantPowerModel import com.atlarge.opendc.core.power.PowerModel import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job -import kotlinx.coroutines.cancel import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.launch @@ -275,6 +275,9 @@ public class SimpleBareMetalDriver( } } + override val scope: CoroutineScope + get() = domain + override suspend fun fail() { withContext(domain.coroutineContext) { serverContext?.cancel(fail = true) diff --git a/opendc/opendc-compute/src/test/kotlin/com/atlarge/opendc/compute/metal/driver/SimpleBareMetalDriverTest.kt b/opendc/opendc-compute/src/test/kotlin/com/atlarge/opendc/compute/metal/driver/SimpleBareMetalDriverTest.kt index 1a2440c2..9378b5d7 100644 --- a/opendc/opendc-compute/src/test/kotlin/com/atlarge/opendc/compute/metal/driver/SimpleBareMetalDriverTest.kt +++ b/opendc/opendc-compute/src/test/kotlin/com/atlarge/opendc/compute/metal/driver/SimpleBareMetalDriverTest.kt @@ -34,8 +34,7 @@ import com.atlarge.opendc.compute.core.image.FlopsApplicationImage import com.atlarge.opendc.compute.metal.Node import com.atlarge.opendc.compute.metal.NodeState import com.atlarge.opendc.compute.metal.monitor.NodeMonitor -import com.atlarge.opendc.core.failure.FailureInjector -import kotlinx.coroutines.channels.Channel +import com.atlarge.opendc.core.failure.FaultInjector import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext @@ -80,8 +79,8 @@ internal class SimpleBareMetalDriverTest { } - val injector = FailureInjector(listOf(driver)) - injector() + val injector = FaultInjector() + injector.enqueue(driver) } runBlocking { |