diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-02-28 21:06:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 21:06:47 +0100 |
| commit | 9ac4f3d18e1dbb11678b8d61fa50c9ad1cdf61d2 (patch) | |
| tree | b64e1eaef89ce53d94f8b459689fd53f990fd1ea /controller-server | |
| parent | 0cbff6a024efb6c67d5eafa261ae249ec01bfe94 (diff) | |
| parent | b65859e900e95d9cfe1f6420bd4548e831f969ec (diff) | |
Merge pull request #12383 from vespa-engine/mpolden/fix-upstream-id
Fix order of upstream ID elements
Diffstat (limited to 'controller-server')
3 files changed, 6 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java index d5c1e41ef24..d6b7d3d173e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java @@ -202,8 +202,8 @@ public class Endpoint { private static String upstreamIdOf(String name, ApplicationId application, ZoneId zone) { return Stream.of(namePart(name, ""), instancePart(application, ""), - application.tenant().value(), application.application().value(), + application.tenant().value(), zone.region().value(), zone.environment().value()) .filter(Predicate.not(String::isEmpty)) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java index c0e184a2823..f968b8c76d7 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java @@ -232,20 +232,20 @@ public class EndpointTest { var zone = ZoneId.from("prod", "us-north-1"); var tests1 = Map.of( // With default cluster - "t1.a1.us-north-1.prod", + "a1.t1.us-north-1.prod", Endpoint.of(app1).named(EndpointId.defaultId()).on(Port.tls(4443)).in(SystemName.main), // With non-default cluster - "c1.t1.a1.us-north-1.prod", + "c1.a1.t1.us-north-1.prod", Endpoint.of(app1).named(EndpointId.of("c1")).on(Port.tls(4443)).in(SystemName.main) ); var tests2 = Map.of( // With non-default instance - "i2.t2.a2.us-north-1.prod", + "i2.a2.t2.us-north-1.prod", Endpoint.of(app2).named(EndpointId.defaultId()).on(Port.tls(4443)).in(SystemName.main), // With non-default instance and cluster - "c2.i2.t2.a2.us-north-1.prod", + "c2.i2.a2.t2.us-north-1.prod", Endpoint.of(app2).named(EndpointId.of("c2")).on(Port.tls(4443)).in(SystemName.main) ); tests1.forEach((expected, endpoint) -> assertEquals(expected, endpoint.upstreamIdOf(new DeploymentId(app1, zone)))); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-get.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-get.json index 4a1cc1ea09a..f7c512842fd 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-get.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-get.json @@ -1,6 +1,6 @@ { "globalrotationoverride": [ - "instance1.tenant1.application1.us-west-1.prod", + "instance1.application1.tenant1.us-west-1.prod", { "status": "in", "reason": "", |