diff options
| author | Harald Musum <musum@yahooinc.com> | 2022-08-09 13:14:40 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2022-08-09 13:14:40 +0200 |
| commit | 423bc233320d3e8b1d4cd7510e76756b5755aacb (patch) | |
| tree | dcf302a38f5e722c5610447303614c710d80209b /configserver | |
| parent | 31ff63622ec70bd4e9aa501ad0d335e0dd007b77 (diff) | |
qrserver -> container, part 2
Diffstat (limited to 'configserver')
2 files changed, 5 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java index d794fa4e27f..2a0d62a1c9a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java @@ -334,7 +334,7 @@ public class TenantApplications implements RequestHandler, HostValidator<Applica } /** - * Given baseIdSegment search/ and id search/qrservers/default.0, return search/qrservers + * Given baseIdSegment search/ and id search/container/default.0, return search/container * @return id segment with one extra level from the id appended */ String appendOneLevelOfId(String baseIdSegment, String id) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java index 472c47c22eb..85e64b4a32d 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java @@ -248,10 +248,10 @@ public class TenantApplicationsTest { @Test public void testAppendIdsInNonRecursiveListing() { TenantApplications applications = createTenantApplications(tenantName, curator, configserverConfig, new MockConfigActivationListener(), new InMemoryFlagSource()); - assertEquals(applications.appendOneLevelOfId("search/music", "search/music/qrservers/default/qr.0"), "search/music/qrservers"); - assertEquals(applications.appendOneLevelOfId("search", "search/music/qrservers/default/qr.0"), "search/music"); - assertEquals(applications.appendOneLevelOfId("search/music/qrservers/default/qr.0", "search/music/qrservers/default/qr.0"), "search/music/qrservers/default/qr.0"); - assertEquals(applications.appendOneLevelOfId("", "search/music/qrservers/default/qr.0"), "search"); + assertEquals(applications.appendOneLevelOfId("search/music", "search/music/container/default/qr.0"), "search/music/container"); + assertEquals(applications.appendOneLevelOfId("search", "search/music/container/default/qr.0"), "search/music"); + assertEquals(applications.appendOneLevelOfId("search/music/container/default/qr.0", "search/music/container/default/qr.0"), "search/music/container/default/qr.0"); + assertEquals(applications.appendOneLevelOfId("", "search/music/container/default/qr.0"), "search"); } @Test |