diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-10-05 15:57:32 +0200 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2020-10-05 15:57:32 +0200 |
| commit | 090db7855b39285d14cab0391d4aa8b37f0f06ac (patch) | |
| tree | 24959cd20b0f62e649a8f0b51e864737a8992403 | |
| parent | b18ca36661a0e2dc350cf776b397de392140a09c (diff) | |
Only 1 target when using config server VIP
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java index 61915860d7c..a260f4a138b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java @@ -55,12 +55,12 @@ public class ZoneApiTest extends ControllerContainerTest { tester.assertResponse(authenticatedRequest("http://localhost:8080/zone/v2/prod/us-north-1"), "ok"); - assertLastRequest(ZoneId.from("prod", "us-north-1"), 2, "GET"); + assertLastRequest(ZoneId.from("prod", "us-north-1"), 1, "GET"); // GET /zone/v2/nodes/v2/node/?recursive=true tester.assertResponse(authenticatedRequest("http://localhost:8080/zone/v2/prod/us-north-1/nodes/v2/node/?recursive=true"), "ok"); - assertLastRequest(ZoneId.from("prod", "us-north-1"), 2, "GET"); + assertLastRequest(ZoneId.from("prod", "us-north-1"), 1, "GET"); // POST /zone/v2/dev/us-north-2/nodes/v2/command/restart?hostname=node1 tester.assertResponse(operatorRequest("http://localhost:8080/zone/v2/dev/aws-us-north-2/nodes/v2/command/restart?hostname=node1", @@ -70,18 +70,18 @@ public class ZoneApiTest extends ControllerContainerTest { // PUT /zone/v2/prod/us-north-1/nodes/v2/state/dirty/node1 tester.assertResponse(operatorRequest("http://localhost:8080/zone/v2/prod/us-north-1/nodes/v2/state/dirty/node1", "", Method.PUT), "ok"); - assertLastRequest(ZoneId.from("prod", "us-north-1"), 2, "PUT"); + assertLastRequest(ZoneId.from("prod", "us-north-1"), 1, "PUT"); // DELETE /zone/v2/prod/us-north-1/nodes/v2/node/node1 tester.assertResponse(operatorRequest("http://localhost:8080/zone/v2/prod/us-north-1/nodes/v2/node/node1", "", Method.DELETE), "ok"); - assertLastRequest(ZoneId.from("prod", "us-north-1"), 2, "DELETE"); + assertLastRequest(ZoneId.from("prod", "us-north-1"), 1, "DELETE"); // PATCH /zone/v2/prod/us-north-1/nodes/v2/node/node1 tester.assertResponse(operatorRequest("http://localhost:8080/zone/v2/dev/aws-us-north-2/nodes/v2/node/node1", "{\"currentRestartGeneration\": 1}", Method.PATCH), "ok"); - assertLastRequest(ZoneId.from("dev", "aws-us-north-2"), 2, "PATCH"); + assertLastRequest(ZoneId.from("dev", "aws-us-north-2"), 1, "PATCH"); assertEquals("{\"currentRestartGeneration\": 1}", proxy.lastRequestBody().get()); assertFalse("Actions are logged to audit log", tester.controller().auditLogger().readLog().entries().isEmpty()); |