diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-09-20 08:54:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-20 08:54:59 +0200 |
commit | 5ecf27f2099432ed15eeb4c5dbc0d2f3708bf0e1 (patch) | |
tree | 9b531655e50e7f2038399bf7750e0632848d4736 /controller-server/src | |
parent | adc3f3eaee4e53f5c1b68ccb22a943f0148b6f0e (diff) | |
parent | 7feeb6f2e2fd1134e1fef3d99d49777f30cf8fa0 (diff) |
Merge pull request #7012 from vespa-engine/mpolden/controller-infra-provisioner
Allocate nodes of type controller to controller app
Diffstat (limited to 'controller-server/src')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java index aea809de365..b0b3b352726 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java @@ -27,12 +27,9 @@ import com.yahoo.vespa.hosted.controller.application.SystemApplication; import com.yahoo.vespa.serviceview.bindings.ApplicationView; import com.yahoo.vespa.serviceview.bindings.ClusterView; import com.yahoo.vespa.serviceview.bindings.ServiceView; -import org.json.JSONException; -import org.json.JSONObject; import java.io.IOException; import java.io.OutputStream; -import java.net.URI; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -53,7 +50,6 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer private final Map<ApplicationId, Application> applications = new LinkedHashMap<>(); private final Map<String, EndpointStatus> endpoints = new HashMap<>(); - private final Map<URI, Version> versions = new HashMap<>(); private final NodeRepositoryMock nodeRepository = new NodeRepositoryMock(); private final Map<DeploymentId, ServiceConvergence> serviceStatus = new HashMap<>(); private final Version initialVersion = new Version(6, 1, 0); |