diff options
Diffstat (limited to 'controller-server/src/test/java/com')
4 files changed, 31 insertions, 3 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java index ed81ce36600..3fa593fcf64 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java @@ -233,7 +233,7 @@ public class ApplicationApiTest extends ControllerContainerTest { .userIdentity(USER_ID) .properties(Map.of("recursive", "true", "production", "true")), - new File("tenant-without-applications.json")); + new File("tenant-with-empty-application.json")); // GET at an application, with "&recursive=true&production=true", recurses over no instances yet, as they are not in deployment spec. tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1", GET) .userIdentity(USER_ID) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-empty-application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-empty-application.json new file mode 100644 index 00000000000..58c76b8227e --- /dev/null +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-empty-application.json @@ -0,0 +1,16 @@ +{ + "tenant": "tenant1", + "type": "ATHENS", + "athensDomain": "domain1", + "property": "property1", + "applications": [ + { + "tenant": "tenant1", + "application": "application1", + "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1" + } + ], + "metaData":{ + "createdAtMillis": "(ignore)" + } +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json index 03e5eb2b7a8..7cc1a51a114 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json @@ -22,7 +22,13 @@ "budgetUsed": 0.0, "clusterSize": 5 }, - "applications": [], + "applications": [ + { + "tenant": "my-tenant", + "application": "my-app", + "url": "http://localhost:8080/application/v4/tenant/my-tenant/application/my-app" + } + ], "metaData":{ "createdAtMillis": "(ignore)" } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json index dc717b5cac0..1662484ade8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json @@ -31,7 +31,13 @@ "budgetUsed": 0.0, "clusterSize": 5 }, - "applications": [], + "applications": [ + { + "tenant": "my-tenant", + "application": "my-app", + "url": "http://localhost:8080/application/v4/tenant/my-tenant/application/my-app" + } + ], "metaData": { "createdAtMillis": "(ignore)" } |