diff options
| author | Harald Musum <musum@verizonmedia.com> | 2022-08-09 15:04:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-09 15:04:00 +0200 |
| commit | 333c6207f11abc5ad66fcc4dd83924dda4cab409 (patch) | |
| tree | 628295c0cf2cda3b62cbef9ee7076c4b4941e89d /configserver | |
| parent | 065fe58b7b15ae33a5b8736250fd29a84650893f (diff) | |
| parent | 70ed8f8b6f16e313896aac23da52158d35c36eff (diff) | |
Merge pull request #23610 from vespa-engine/hmusum/qrserver-to-container-2
qrserver -> container, part 2 [run-systemtest]
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 |