diff options
Diffstat (limited to 'configserver')
9 files changed, 33 insertions, 34 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java index 089b662b797..32ce2c6f509 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpGetConfigHandlerTest.java @@ -35,7 +35,7 @@ public class HttpGetConfigHandlerTest { @Before public void setUp() { - mockRequestHandler = new MockRequestHandler(); + mockRequestHandler = new MockRequestHandler(ApplicationId.defaultId()); mockRequestHandler.setAllConfigs(new HashSet<>() {{ add(new ConfigKey<>("bar", "myid", "foo")); }} ); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java index 9113978d58b..dea9196c949 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/HttpListConfigsHandlerTest.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.http; +import com.yahoo.config.provision.ApplicationId; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.vespa.config.ConfigKey; @@ -30,7 +31,7 @@ public class HttpListConfigsHandlerTest { @Before public void setUp() { - mockRequestHandler = new MockRequestHandler(); + mockRequestHandler = new MockRequestHandler(ApplicationId.defaultId()); mockRequestHandler.setAllConfigs(new HashSet<>() {{ add(new ConfigKey<>("bar", "conf/id/", "foo")); }} ); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java index 46a17795acf..97789caeb4b 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpGetConfigHandlerTest.java @@ -41,7 +41,7 @@ public class HttpGetConfigHandlerTest { @Before public void setUp() { - mockRequestHandler = new MockRequestHandler(); + mockRequestHandler = new MockRequestHandler(ApplicationId.defaultId()); mockRequestHandler.setAllConfigs(new HashSet<>() {{ add(new ConfigKey<>("bar", "myid", "foo")); }} ); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java index e8484ad10fe..d91d41173b2 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HttpListConfigsHandlerTest.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.http.v2; +import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; import com.yahoo.container.jdisc.HttpRequest; @@ -39,7 +40,7 @@ public class HttpListConfigsHandlerTest { @Before public void setUp() { - mockRequestHandler = new MockRequestHandler(); + mockRequestHandler = new MockRequestHandler(ApplicationId.defaultId()); mockRequestHandler.setAllConfigs(new HashSet<>() {{ add(new ConfigKey<>("bar", "conf/id", "foo")); }} ); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRequestHandler.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRequestHandler.java index 21b85e0d09c..6b0cfbf579f 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRequestHandler.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRequestHandler.java @@ -28,13 +28,15 @@ public class MockRequestHandler implements RequestHandler, ReloadHandler, Tenant private Set<ConfigKey<?>> allConfigs = new HashSet<>(); public Map<ApplicationId, ConfigResponse> responses = new LinkedHashMap<>(); + private final ApplicationId applicationId; private final boolean pretendToHaveLoadedAnyApplication; - public MockRequestHandler() { - this(false); + public MockRequestHandler(ApplicationId applicationId) { + this(applicationId, false); } - public MockRequestHandler(boolean pretendToHaveLoadedAnyApplication) { + public MockRequestHandler(ApplicationId applicationId, boolean pretendToHaveLoadedAnyApplication) { + this.applicationId = applicationId; this.pretendToHaveLoadedAnyApplication = pretendToHaveLoadedAnyApplication; } @@ -88,7 +90,7 @@ public class MockRequestHandler implements RequestHandler, ReloadHandler, Tenant @Override public ApplicationId resolveApplicationId(String hostName) { - return ApplicationId.defaultId(); + return applicationId; } @Override diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpc.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpc.java index d923f4c1856..9f514d9996f 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpc.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/MockRpc.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.config.server.rpc; import com.yahoo.cloud.config.ConfigserverConfig; -import com.yahoo.config.provision.TenantName; import com.yahoo.component.Version; import com.yahoo.vespa.config.protocol.ConfigResponse; import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; @@ -12,7 +11,6 @@ import com.yahoo.vespa.config.server.host.ConfigRequestHostLivenessTracker; import com.yahoo.vespa.config.server.host.HostRegistries; import com.yahoo.vespa.config.server.monitoring.Metrics; import com.yahoo.vespa.config.server.rpc.security.NoopRpcAuthorizer; -import com.yahoo.vespa.config.server.tenant.MockTenantProvider; import java.io.File; import java.time.Duration; @@ -39,20 +37,15 @@ public class MockRpc extends RpcServer { public volatile JRTServerConfigRequest latestRequest = null; - public MockRpc(int port, boolean createDefaultTenant, boolean pretendToHaveLoadedAnyApplication, File tempDir) { - super(createConfig(port), null, Metrics.createTestMetrics(), - new HostRegistries(), new ConfigRequestHostLivenessTracker(), new FileServer(tempDir), new NoopRpcAuthorizer(), new RpcRequestHandlerProvider()); - if (createDefaultTenant) { - onTenantCreate(TenantName.from("default"), new MockTenantProvider(pretendToHaveLoadedAnyApplication)); - } - } - - public MockRpc(int port, boolean createDefaultTenant, File tempDir) { - this(port, createDefaultTenant, true, tempDir); - } - public MockRpc(int port, File tempDir) { - this(port, true, tempDir); + super(createConfig(port), + null, + Metrics.createTestMetrics(), + new HostRegistries(), + new ConfigRequestHostLivenessTracker(), + new FileServer(tempDir), + new NoopRpcAuthorizer(), + new RpcRequestHandlerProvider()); } private static ConfigserverConfig createConfig(int port) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java index 0b33de2a42c..de9ad60ddf8 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcServerTest.java @@ -52,7 +52,7 @@ public class RpcServerTest { @Test public void testRpcServer() throws IOException, SAXException, InterruptedException { - try (RpcTester tester = new RpcTester(temporaryFolder)) { + try (RpcTester tester = new RpcTester(ApplicationId.defaultId(), temporaryFolder)) { testPrintStatistics(tester); testGetConfig(tester); testEnabled(tester); @@ -79,7 +79,7 @@ public class RpcServerTest { @Test public void testEmptySentinelConfigWhenAppDeletedOnHostedVespa() throws IOException, InterruptedException { ConfigserverConfig.Builder configBuilder = new ConfigserverConfig.Builder().canReturnEmptySentinelConfig(true); - try (RpcTester tester = new RpcTester(temporaryFolder, configBuilder)) { + try (RpcTester tester = new RpcTester(ApplicationId.defaultId(), temporaryFolder, configBuilder)) { tester.rpcServer().onTenantDelete(TenantName.defaultName()); tester.rpcServer().onTenantsLoaded(); JRTClientConfigRequest clientReq = createSentinelRequest(); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java index ad42e90db82..fd8c791b567 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/RpcTester.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.config.server.rpc; import com.yahoo.cloud.config.ConfigserverConfig; +import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.HostLivenessTracker; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.Zone; @@ -58,21 +59,21 @@ public class RpcTester implements AutoCloseable { private Thread t; private Supervisor sup; - private List<Integer> allocatedPorts; + private final List<Integer> allocatedPorts; private final TemporaryFolder temporaryFolder; private final ConfigserverConfig configserverConfig; - RpcTester(TemporaryFolder temporaryFolder) throws InterruptedException, IOException { - this(temporaryFolder, new ConfigserverConfig.Builder()); + RpcTester(ApplicationId applicationId, TemporaryFolder temporaryFolder) throws InterruptedException, IOException { + this(applicationId, temporaryFolder, new ConfigserverConfig.Builder()); } - RpcTester(TemporaryFolder temporaryFolder, ConfigserverConfig.Builder configBuilder) throws InterruptedException, IOException { + RpcTester(ApplicationId applicationId, TemporaryFolder temporaryFolder, ConfigserverConfig.Builder configBuilder) throws InterruptedException, IOException { this.temporaryFolder = temporaryFolder; allocatedPorts = new ArrayList<>(); int port = allocatePort(); spec = createSpec(port); - tenantProvider = new MockTenantProvider(); + tenantProvider = new MockTenantProvider(applicationId); generationCounter = new MemoryGenerationCounter(); configBuilder.rpcport(port); configserverConfig = new ConfigserverConfig(configBuilder); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/MockTenantProvider.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/MockTenantProvider.java index 4f839fbd811..94ece6bf4b8 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/MockTenantProvider.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/MockTenantProvider.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.tenant; +import com.yahoo.config.provision.ApplicationId; import com.yahoo.vespa.config.server.RequestHandler; import com.yahoo.vespa.config.server.rpc.MockRequestHandler; @@ -11,12 +12,12 @@ public class MockTenantProvider implements TenantHandlerProvider { private final MockRequestHandler requestHandler; - public MockTenantProvider() { - this(false); + public MockTenantProvider(ApplicationId applicationId) { + this(applicationId, false); } - public MockTenantProvider(boolean pretendToHaveLoadedAnyApplication) { - this.requestHandler = new MockRequestHandler(pretendToHaveLoadedAnyApplication); + public MockTenantProvider(ApplicationId applicationId, boolean pretendToHaveLoadedAnyApplication) { + this.requestHandler = new MockRequestHandler(applicationId, pretendToHaveLoadedAnyApplication); } @Override |