diff options
Diffstat (limited to 'controller-server/src/test/java/com')
2 files changed, 5 insertions, 5 deletions
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": "", |