diff options
| author | smorgrav <torbjorn@smorgrav.org> | 2020-09-23 14:53:24 +0200 |
|---|---|---|
| committer | smorgrav <torbjorn@smorgrav.org> | 2020-09-23 14:53:24 +0200 |
| commit | cf2070eeca6a91be150a100cd32ec97129627459 (patch) | |
| tree | bc338d98354d0a696679ab3ec0399f68e9fdb0a1 /controller-server | |
| parent | dbe1d53b29e2fc699bd98fd9cf393be2e1987809 (diff) | |
Add bindings to controller tester and test api prefix
Diffstat (limited to 'controller-server')
3 files changed, 19 insertions, 5 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java index f79051f2edb..4b4a8415d69 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java @@ -106,6 +106,7 @@ public class ControllerContainerTest { " </handler>\n" + " <handler id='com.yahoo.vespa.hosted.controller.restapi.routing.RoutingApiHandler'>\n" + " <binding>http://*/routing/v1/*</binding>\n" + + " <binding>http://*/api/routing/v1/*</binding>\n" + " </handler>\n" + variablePartXml() + "</container>"; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java index 25d21dd702d..b2e9fc956ec 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java @@ -55,11 +55,6 @@ public class RoutingApiTest extends ControllerContainerTest { Request.Method.GET), new File("discovery/root.json")); - // GET root with api prefix - tester.assertResponse(operatorRequest("http://localhost:8080/api/routing/v1/", "", - Request.Method.GET), - new File("discovery/root.json")); - // GET tenant tester.assertResponse(operatorRequest("http://localhost:8080/routing/v1/status/tenant/t1", "", Request.Method.GET), @@ -81,6 +76,14 @@ public class RoutingApiTest extends ControllerContainerTest { tester.assertResponse(operatorRequest("http://localhost:8080/routing/v1/status/environment/", "", Request.Method.GET), new File("discovery/environment.json")); + + + // GET instance with api prefix (test that the /api prefix works) + tester.assertResponse(authenticatedRequest("http://localhost:8080/api/routing/v1/status/tenant/t1/application/a1/instance/default/", + "", + Request.Method.GET), + new File("discovery/instance_api.json")); + } @Test diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/discovery/instance_api.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/discovery/instance_api.json new file mode 100644 index 00000000000..a9e789d9fe9 --- /dev/null +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/discovery/instance_api.json @@ -0,0 +1,10 @@ +{ + "resources": [ + { + "url": "http://localhost:8080/api/routing/v1/status/tenant/t1/application/a1/instance/default/environment/prod/region/us-east-3/" + }, + { + "url": "http://localhost:8080/api/routing/v1/status/tenant/t1/application/a1/instance/default/environment/prod/region/us-west-1/" + } + ] +}
\ No newline at end of file |