diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-01-12 07:44:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-12 07:44:45 +0100 |
commit | 16bdc8d758c9a4c534cb3b01f92494f9e28b08ef (patch) | |
tree | 4a03a8e185c4680c6308dbed1678cb93a9975541 /controller-server/src/test | |
parent | 6d85e1999e3120a915e8b2111d51829c93fdf160 (diff) | |
parent | 8a7827ac1afb4cf7ba5dbeec78b81c888b60c740 (diff) |
Merge pull request #16001 from vespa-engine/ldalves/tenant-meta-data
move metaData to recursive tenant api
Diffstat (limited to 'controller-server/src/test')
12 files changed, 36 insertions, 42 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 16896b1a5f5..84b6ec2b263 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 @@ -1339,7 +1339,7 @@ public class ApplicationApiTest extends ControllerContainerTest { .data("{\"athensDomain\":\"domain2\", \"property\":\"property1\"}") .userIdentity(authorizedUser) .oktaAccessToken(OKTA_AT).oktaIdentityToken(OKTA_IT), - "{\"tenant\":\"tenant1\",\"type\":\"ATHENS\",\"athensDomain\":\"domain2\",\"property\":\"property1\",\"applications\":[]}", + "{\"tenant\":\"tenant1\",\"type\":\"ATHENS\",\"athensDomain\":\"domain2\",\"property\":\"property1\",\"applications\":[],\"metaData\":{}}", 200); // Deleting a tenant for an Athens domain the user is not admin for is disallowed @@ -1532,19 +1532,6 @@ public class ApplicationApiTest extends ControllerContainerTest { new File("deployment-without-shared-endpoints.json")); } - @Test - public void testTenantMetaData() { - createAthenzDomainWithAdmin(ATHENZ_TENANT_DOMAIN, USER_ID); - deploymentTester.clock().setInstant(Instant.parse("2020-01-08T10:47:01Z")); - deploymentTester.controllerTester().createTenant("tenant1", "domain1", 1L); - deploymentTester.controllerTester().createApplication("tenant1", "application1", "instance1"); - var app = deploymentTester.newDeploymentContext(); - app.submit(applicationPackageDefault).deploy(); - deploymentTester.jobs().deploy(app.instanceId(), JobType.devUsEast1, Optional.empty(), applicationPackage()); - tester.assertResponse(request("/application/v4/tenant", GET).userIdentity(USER_ID), - new File("tenant-with-metadata.json")); - } - private MultiPartStreamer createApplicationDeployData(ApplicationPackage applicationPackage, boolean deployDirectly) { return createApplicationDeployData(Optional.of(applicationPackage), deployDirectly); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-until-tenant-root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-until-tenant-root.json index d37b4ff63f4..e8f7839e7cd 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-until-tenant-root.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-until-tenant-root.json @@ -1,5 +1,5 @@ [ - @include(tenant-with-application.json), + @include(tenant-with-application-with-metadata.json), @include(tenant2.json) ] diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application-with-metadata.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application-with-metadata.json new file mode 100644 index 00000000000..b11b65ead30 --- /dev/null +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application-with-metadata.json @@ -0,0 +1,18 @@ +{ + "tenant": "tenant1", + "type": "ATHENS", + "athensDomain": "domain1", + "property": "property1", + "applications": [ + { + "tenant": "tenant1", + "application":"application1", + "instance":"instance1", + "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1" + } + ], + "metaData":{ + "lastDeploymentToDevMillis":"(ignore)", + "lastSubmissionToProdMillis":1000 + } +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json index edd3d7cc34f..578323be373 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-application.json @@ -10,5 +10,6 @@ "instance":"instance1", "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1" } - ] + ], + "metaData":{} } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-contact-info.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-contact-info.json index 01677f05eeb..a7d1d7413f3 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-contact-info.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-contact-info.json @@ -15,5 +15,6 @@ "bob" ] ], - "applications": [] + "applications": [], + "metaData":{} } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-metadata.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-metadata.json deleted file mode 100644 index a30f3ddf992..00000000000 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-with-metadata.json +++ /dev/null @@ -1,19 +0,0 @@ -[{ - "tenant": "tenant", - "metaData": { - "type": "ATHENS", - "athensDomain": "domain1000", - "property": "Property1000", - "lastDeploymentToDevMillis": 1578480421000, - "lastSubmissionToProdMillis": 1000 - }, - "url": "http://localhost:8080/application/v4/tenant/tenant" -}, { - "tenant": "tenant1", - "metaData": { - "type": "ATHENS", - "athensDomain": "domain1", - "property": "Property1" - }, - "url": "http://localhost:8080/application/v4/tenant/tenant1" -}] diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications-with-id.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications-with-id.json index 5624150463a..5e8f0e4b575 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications-with-id.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications-with-id.json @@ -4,5 +4,6 @@ "athensDomain": "domain2", "property": "property2", "propertyId": "1234", - "applications": [] + "applications": [], + "metaData": {} } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json index 3ad5a307348..82848fe971d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-without-applications.json @@ -5,5 +5,6 @@ "property": "property1", "applications": [ - ] + ], + "metaData":{} } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-recursive.json index 16b963a190e..574c3d2c476 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-recursive.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-recursive.json @@ -5,5 +5,6 @@ "property": "property1", "applications": [ @include(instance1-recursive.json) - ] + ], + "metaData":{"lastDeploymentToDevMillis":"(ignore)","lastSubmissionToProdMillis":1000} } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant2.json index 2d6cc7b7208..21d5ceba805 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant2.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant2.json @@ -15,5 +15,6 @@ "bob" ] ], - "applications": [] + "applications": [], + "metaData":{} }
\ No newline at end of file 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 068b4df6fd8..28dad0b0c2f 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 @@ -15,5 +15,6 @@ "budgetUsed": 0.0, "clusterSize": 5 }, - "applications": [] + "applications": [], + "metaData":{} } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-without-applications.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-without-applications.json index b1f7b62a248..73b97e09827 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-without-applications.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-without-applications.json @@ -8,5 +8,6 @@ "budgetUsed": 0.0, "clusterSize": 5 }, - "applications": [] + "applications": [], + "metaData":{} } |