From 2ba5fc1247472d026f10ad5cf738dcb7e078a9ee Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 2 Mar 2021 21:20:41 +0100 Subject: compute: Remove ServiceRegistry fields This change removes the use of ServiceRegistry in the OpenDC compute module. It was not actually being used by any of the code and we are moving to another interface in the future. --- .../src/main/kotlin/org/opendc/compute/core/Server.kt | 6 ------ .../src/main/kotlin/org/opendc/compute/simulator/SimVirtDriver.kt | 2 -- 2 files changed, 8 deletions(-) (limited to 'simulator/opendc-compute') diff --git a/simulator/opendc-compute/opendc-compute-core/src/main/kotlin/org/opendc/compute/core/Server.kt b/simulator/opendc-compute/opendc-compute-core/src/main/kotlin/org/opendc/compute/core/Server.kt index 948f622f..1fb5679a 100644 --- a/simulator/opendc-compute/opendc-compute-core/src/main/kotlin/org/opendc/compute/core/Server.kt +++ b/simulator/opendc-compute/opendc-compute-core/src/main/kotlin/org/opendc/compute/core/Server.kt @@ -26,7 +26,6 @@ import kotlinx.coroutines.flow.Flow import org.opendc.compute.core.image.Image import org.opendc.core.resource.Resource import org.opendc.core.resource.TagContainer -import org.opendc.core.services.ServiceRegistry import java.util.UUID /** @@ -63,11 +62,6 @@ public data class Server( */ public val state: ServerState, - /** - * The services published by this server. - */ - public val services: ServiceRegistry, - /** * The events that are emitted by the server. */ diff --git a/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimVirtDriver.kt b/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimVirtDriver.kt index d28b2f0d..35d82211 100644 --- a/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimVirtDriver.kt +++ b/simulator/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimVirtDriver.kt @@ -33,7 +33,6 @@ import org.opendc.compute.core.metal.Node import org.opendc.compute.core.virt.HypervisorEvent import org.opendc.compute.core.virt.driver.InsufficientMemoryOnServerException import org.opendc.compute.core.virt.driver.VirtDriver -import org.opendc.core.services.ServiceRegistry import org.opendc.simulator.compute.* import org.opendc.simulator.compute.interference.IMAGE_PERF_INTERFERENCE_MODEL import org.opendc.simulator.compute.interference.PerformanceInterferenceModel @@ -132,7 +131,6 @@ public class SimVirtDriver( flavor, image, ServerState.BUILD, - ServiceRegistry(), events ) availableMemory -= requiredMemory -- cgit v1.2.3