diff options
| author | jonmv <venstad@gmail.com> | 2022-04-10 14:48:57 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2022-04-11 13:42:26 +0200 |
| commit | aca7214bfcd89d761523e5d37d26e7daa260b8b1 (patch) | |
| tree | 672a8e3a3f54de064e23da52d1256c3e37e32835 | |
| parent | 9354bd3ea29851eed945c4bd61370629bb4d5598 (diff) | |
Update all response files in controller-server with unified format, and static timestamps
81 files changed, 1131 insertions, 440 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java index 9b9f6fb08b6..298380ac177 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java @@ -45,7 +45,7 @@ import static org.junit.Assert.fail; */ public class ContainerTester { - private static final boolean writeResponses = true; + private static final boolean writeResponses = false; private final JDisc container; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json index fc40a9ce692..d90e03a1439 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json @@ -1,7 +1,7 @@ { "clusters": { "default": { - "type":"container", + "type": "container", "min": { "nodes": 2, "groups": 1, @@ -13,7 +13,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": "(ignore)" + "cost": 0.09 }, "max": { "nodes": 2, @@ -26,7 +26,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": "(ignore)" + "cost": 0.35 }, "current": { "nodes": 2, @@ -39,7 +39,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": "(ignore)" + "cost": 0.18 }, "target": { "nodes": 2, @@ -52,7 +52,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": "(ignore)" + "cost": 0.24 }, "utilization": { "cpu": 0.1, @@ -78,7 +78,7 @@ "diskSpeed": "fast", "storageType": "any" }, - "cost": "(ignore)" + "cost": 0.0 }, "to": { "nodes": 2, @@ -91,7 +91,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": "(ignore)" + "cost": 0.18 }, "at": 1234, "completion": 2234 @@ -101,7 +101,7 @@ "autoscalingStatus": "Cluster is ideally scaled", "scalingDuration": 360000, "maxQueryGrowthRate": 0.7, - "currentQueryFractionOfMax":0.3 + "currentQueryFractionOfMax": 0.3 } } -}
\ No newline at end of file +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-list.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-list.json index 2479f127f92..74b9abb1e3b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-list.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-list.json @@ -1,12 +1,12 @@ [ { "tenant": "tenant1", - "application":"application1", - "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1", + "application": "application1", + "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1", "instances": [ { - "instance":"instance1", - "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1" + "instance": "instance1", + "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1" } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-instances.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-instances.json index 2ee72f150e5..953fb30e522 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-instances.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-instances.json @@ -2,11 +2,14 @@ "tenant": "tenant1", "application": "application1", "deployments": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/job/", - "instances": [], - "pemDeployKeys": [], + "instances": [ + ], + "pemDeployKeys": [ + ], "metrics": { "queryServiceQuality": 0.0, "writeServiceQuality": 0.0 }, - "activity": {} + "activity": { + } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json index c8f5b7bf50a..35106189672 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2-with-patches.json @@ -13,7 +13,8 @@ "instances": [ { "instance": "default", - "deployments": [] + "deployments": [ + ] }, { "instance": "instance1", @@ -25,9 +26,11 @@ "commit": "commit1" } }, - "changeBlockers": [], + "changeBlockers": [ + ], "rotationId": "rotation-id-2", - "deployments": [] + "deployments": [ + ] } ], "pemDeployKeys": [ @@ -37,5 +40,6 @@ "queryServiceQuality": 0.0, "writeServiceQuality": 0.0 }, - "activity": {} + "activity": { + } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json index 7aae1815dac..4ba8373caba 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application2.json @@ -12,7 +12,8 @@ "instances": [ { "instance": "default", - "deployments": [] + "deployments": [ + ] }, { "instance": "instance1", @@ -24,15 +25,19 @@ "commit": "commit1" } }, - "changeBlockers": [], + "changeBlockers": [ + ], "rotationId": "rotation-id-2", - "deployments": [] + "deployments": [ + ] } ], - "pemDeployKeys": [], + "pemDeployKeys": [ + ], "metrics": { "queryServiceQuality": 0.0, "writeServiceQuality": 0.0 }, - "activity": {} + "activity": { + } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deploy-result.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deploy-result.json index 06b48064b94..963d3b7c67c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deploy-result.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deploy-result.json @@ -1,9 +1,12 @@ { - "revisionId":"(ignore)", - "applicationZipSize":"(ignore)", - "prepareMessages":[], - "configChangeActions":{ - "restart":[], - "refeed":[] + "revisionId": "da39a3ee5e6b4b0d3255bfef95601890afd80709", + "applicationZipSize": 0, + "prepareMessages": [ + ], + "configChangeActions": { + "restart": [ + ], + "refeed": [ + ] } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-cloud.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-cloud.json index 74f41524d3e..50531ed5120 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-cloud.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-cloud.json @@ -17,9 +17,9 @@ "clusters": "http://localhost:8080/application/v4/tenant/scoober/application/albums/instance/default/environment/prod/region/aws-us-east-1c/clusters", "nodes": "http://localhost:8080/zone/v2/prod/aws-us-east-1c/nodes/v2/node/?recursive=true&application=scoober.albums.default", "yamasUrl": "http://monitoring-system.test/?environment=prod®ion=aws-us-east-1c&application=scoober.albums", - "version": "(ignore)", + "version": "7.164.0", "revision": "1.0.1-commit1", - "deployTimeEpochMs": "(ignore)", + "deployTimeEpochMs": 1600000000000, "screwdriverId": "1000", "applicationVersion": { "build": 1, @@ -28,8 +28,9 @@ "commit": "commit1" }, "status": "complete", - "quota": "(ignore)", - "activity": {}, + "quota": 1.062, + "activity": { + }, "metrics": { "queriesPerSecond": 0.0, "writesPerSecond": 0.0, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted-2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted-2.json index 8ea3f318d1d..74d5bf454aa 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted-2.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-job-accepted-2.json @@ -1,4 +1,4 @@ { "message": "Deployment started in run 1 of dev-us-east-1 for tenant1.application1.myuser. This may take about 15 minutes the first time.", "run": 1 -}
\ No newline at end of file +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json index 782819ef6c6..9395e8f65ad 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json @@ -5,7 +5,8 @@ "steps": [ { "type": "instance", - "dependencies": [], + "dependencies": [ + ], "declared": true, "instance": "instance1", "readyAt": 0, @@ -20,14 +21,15 @@ "latestVersions": { "platform": { "platform": "6.1.0", - "at": "(ignore)", + "at": 1649509163000, "upgrade": true, "available": [ { "platform": "6.1.0" } ], - "blockers": [] + "blockers": [ + ] }, "application": { "application": { @@ -48,13 +50,15 @@ } } ], - "blockers": [] + "blockers": [ + ] } } }, { "type": "test", - "dependencies": [], + "dependencies": [ + ], "declared": false, "instance": "instance1", "readyAt": 0, @@ -62,12 +66,13 @@ "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/system-test", "environment": "test", "region": "test.us-east-1", - "toRun": [], + "toRun": [ + ], "runs": [ { "id": 2, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/system-test/run/2", - "start": "(ignore)", + "start": 1600000000000, "status": "running", "versions": { "targetPlatform": "6.1.0", @@ -124,8 +129,8 @@ { "id": 1, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/system-test/run/1", - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success", "versions": { "targetPlatform": "6.1.0", @@ -183,7 +188,8 @@ }, { "type": "test", - "dependencies": [], + "dependencies": [ + ], "declared": false, "instance": "instance1", "readyAt": 0, @@ -191,12 +197,13 @@ "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/staging-test", "environment": "staging", "region": "staging.us-east-3", - "toRun": [], + "toRun": [ + ], "runs": [ { "id": 2, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/staging-test/run/2", - "start": "(ignore)", + "start": 1600000000000, "status": "running", "versions": { "targetPlatform": "6.1.0", @@ -269,8 +276,8 @@ { "id": 1, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/staging-test/run/1", - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success", "versions": { "targetPlatform": "6.1.0", @@ -370,8 +377,8 @@ { "id": 1, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/production-us-central-1/run/1", - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success", "versions": { "targetPlatform": "6.1.0", @@ -427,7 +434,7 @@ { "id": 1, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/production-us-west-1/run/1", - "start": "(ignore)", + "start": 1600000000000, "status": "running", "versions": { "targetPlatform": "6.1.0", @@ -483,7 +490,7 @@ { "id": 2, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/production-us-east-3/run/2", - "start": "(ignore)", + "start": 1600000000000, "status": "running", "versions": { "targetPlatform": "6.1.0", @@ -512,8 +519,8 @@ { "id": 1, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/production-us-east-3/run/1", - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success", "versions": { "targetPlatform": "6.1.0", @@ -547,18 +554,20 @@ ], "declared": true, "instance": "instance2", - "deploying": {}, + "deploying": { + }, "latestVersions": { "platform": { "platform": "6.1.0", - "at": "(ignore)", + "at": 1649509163000, "upgrade": true, "available": [ { "platform": "6.1.0" } ], - "blockers": [] + "blockers": [ + ] }, "application": { "application": { @@ -595,7 +604,8 @@ } } ], - "blockers": [] + "blockers": [ + ] } } }, @@ -623,7 +633,8 @@ } } ], - "runs": [] + "runs": [ + ] }, { "type": "deployment", @@ -649,7 +660,8 @@ } } ], - "runs": [] + "runs": [ + ] }, { "type": "deployment", @@ -675,7 +687,8 @@ } } ], - "runs": [] + "runs": [ + ] } ], "builds": [ @@ -705,4 +718,3 @@ } ] } - diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-with-routing-policy.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-with-routing-policy.json index 3f70ae1e303..e0d2b0caf06 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-with-routing-policy.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-with-routing-policy.json @@ -14,12 +14,12 @@ "legacy": false } ], - "clusters":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-west-1/clusters", + "clusters": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-west-1/clusters", "nodes": "http://localhost:8080/zone/v2/prod/us-west-1/nodes/v2/node/?recursive=true&application=tenant1.application1.instance1", "yamasUrl": "http://monitoring-system.test/?environment=prod®ion=us-west-1&application=tenant1.application1.instance1", - "version": "(ignore)", + "version": "6.1.0", "revision": "1.0.1-commit1", - "deployTimeEpochMs": "(ignore)", + "deployTimeEpochMs": 1600000000000, "screwdriverId": "1000", "applicationVersion": { "build": 1, @@ -28,8 +28,9 @@ "commit": "commit1" }, "status": "complete", - "quota": "(ignore)", - "activity": {}, + "quota": 1.062, + "activity": { + }, "metrics": { "queriesPerSecond": 0.0, "writesPerSecond": 0.0, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-without-shared-endpoints.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-without-shared-endpoints.json index 860fe541682..e0d2b0caf06 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-without-shared-endpoints.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-without-shared-endpoints.json @@ -14,12 +14,12 @@ "legacy": false } ], - "clusters":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-west-1/clusters", + "clusters": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-west-1/clusters", "nodes": "http://localhost:8080/zone/v2/prod/us-west-1/nodes/v2/node/?recursive=true&application=tenant1.application1.instance1", "yamasUrl": "http://monitoring-system.test/?environment=prod®ion=us-west-1&application=tenant1.application1.instance1", "version": "6.1.0", "revision": "1.0.1-commit1", - "deployTimeEpochMs": "(ignore)", + "deployTimeEpochMs": 1600000000000, "screwdriverId": "1000", "applicationVersion": { "build": 1, @@ -28,8 +28,9 @@ "commit": "commit1" }, "status": "complete", - "quota": "(ignore)", - "activity": {}, + "quota": 1.062, + "activity": { + }, "metrics": { "queriesPerSecond": 0.0, "writesPerSecond": 0.0, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json index 315b1af25c7..6965b246176 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment.json @@ -33,9 +33,9 @@ "clusters": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/clusters", "nodes": "http://localhost:8080/zone/v2/prod/us-central-1/nodes/v2/node/?recursive=true&application=tenant1.application1.instance1", "yamasUrl": "http://monitoring-system.test/?environment=prod®ion=us-central-1&application=tenant1.application1.instance1", - "version": "(ignore)", - "revision": "(ignore)", - "deployTimeEpochMs": "(ignore)", + "version": "6.1.0", + "revision": "1.0.1-commit1", + "deployTimeEpochMs": 1600000000000, "screwdriverId": "123", "endpointStatus": [ { @@ -43,7 +43,7 @@ "rotationId": "rotation-id-1", "clusterId": "foo", "status": "UNKNOWN", - "lastUpdated": "(ignore)" + "lastUpdated": 0 } ], "applicationVersion": { @@ -53,7 +53,7 @@ "commit": "commit1" }, "status": "complete", - "quota": "(ignore)", + "quota": 1.062, "activity": { "lastQueried": 1527848130000, "lastWritten": 1527848130000, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-delete.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-delete.json index 2df97a6c765..4b97410b21c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-delete.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-delete.json @@ -1 +1,3 @@ -{"message":"Successfully set tenant1.application1.instance1 in prod.us-west-1 in service"} +{ + "message": "Successfully set tenant1.application1.instance1 in prod.us-west-1 in service" +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-put.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-put.json index 6a41b0000e4..e7f5c2407bd 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-put.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/global-rotation-put.json @@ -1 +1,3 @@ -{"message":"Successfully set tenant1.application1.instance1 in prod.us-west-1 out of service"} +{ + "message": "Successfully set tenant1.application1.instance1 in prod.us-west-1 out of service" +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-reference-default.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-reference-default.json index 7117cc22507..cf964b0a1ae 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-reference-default.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-reference-default.json @@ -1,6 +1,6 @@ { "tenant": "tenant1", - "application":"application1", - "instance":"default", - "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/default" + "application": "application1", + "instance": "default", + "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/default" } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-reference.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-reference.json index 60243633614..e25f992ab25 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-reference.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-reference.json @@ -1,6 +1,6 @@ { "tenant": "tenant1", - "application":"application1", - "instance":"instance1", - "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1" + "application": "application1", + "instance": "instance1", + "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1" } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-with-routing-policy.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-with-routing-policy.json index afac12a191b..7887c4a684f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-with-routing-policy.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-with-routing-policy.json @@ -6,7 +6,8 @@ "sourceUrl": "repository1/tree/commit1", "commit": "commit1", "projectId": 1000, - "changeBlockers": [], + "changeBlockers": [ + ], "instances": [ { "environment": "prod", @@ -15,10 +16,12 @@ "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-west-1" } ], - "pemDeployKeys": [], + "pemDeployKeys": [ + ], "metrics": { "queryServiceQuality": 0.0, "writeServiceQuality": 0.0 }, - "activity": {} + "activity": { + } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json index b98de97856d..57d687900e6 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance.json @@ -57,7 +57,7 @@ "rotationId": "rotation-id-1", "clusterId": "foo", "status": "UNKNOWN", - "lastUpdated": "(ignore)" + "lastUpdated": 0 } ], "environment": "prod", @@ -74,7 +74,8 @@ "region": "us-west-1" } ], - "pemDeployKeys": [], + "pemDeployKeys": [ + ], "metrics": { "queryServiceQuality": 0.5, "writeServiceQuality": 0.7 diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json index a697c667ab0..09a4fe0622f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance1-recursive.json @@ -41,8 +41,120 @@ ], "rotationId": "rotation-id-1", "instances": [ - @include(dev-us-east-1.json), - @include(prod-us-central-1.json), + { + "tenant": "tenant1", + "application": "application1", + "instance": "instance1", + "environment": "dev", + "region": "us-east-1", + "endpoints": [ + { + "cluster": "default", + "tls": true, + "url": "https://instance1.application1.tenant1.us-east-1.dev.vespa.oath.cloud/", + "scope": "zone", + "routingMethod": "sharedLayer4", + "legacy": false + } + ], + "clusters": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/dev/region/us-east-1/clusters", + "nodes": "http://localhost:8080/zone/v2/dev/us-east-1/nodes/v2/node/?recursive=true&application=tenant1.application1.instance1", + "yamasUrl": "http://monitoring-system.test/?environment=dev®ion=us-east-1&application=tenant1.application1.instance1", + "version": "6.1.0", + "revision": "1.0.1", + "deployTimeEpochMs": 1600000000000, + "screwdriverId": "123", + "status": "complete", + "quota": 1.062, + "activity": { + "lastQueried": 1527848130000, + "lastWritten": 1527848130000, + "lastQueriesPerSecond": 1.0, + "lastWritesPerSecond": 2.0 + }, + "metrics": { + "queriesPerSecond": 1.0, + "writesPerSecond": 2.0, + "documentCount": 3.0, + "queryLatencyMillis": 4.0, + "writeLatencyMillis": 5.0, + "lastUpdated": 123123 + } + }, + { + "bcpStatus": { + "rotationStatus": "UNKNOWN" + }, + "tenant": "tenant1", + "application": "application1", + "instance": "instance1", + "environment": "prod", + "region": "us-central-1", + "endpoints": [ + { + "cluster": "default", + "tls": true, + "url": "https://instance1.application1.tenant1.us-central-1.vespa.oath.cloud/", + "scope": "zone", + "routingMethod": "sharedLayer4", + "legacy": false + }, + { + "cluster": "foo", + "tls": true, + "url": "https://instance1.application1.tenant1.global.vespa.oath.cloud/", + "scope": "global", + "routingMethod": "sharedLayer4", + "legacy": false + }, + { + "cluster": "foo", + "tls": true, + "url": "https://a0.application1.tenant1.us-central-1-r.vespa.oath.cloud/", + "scope": "application", + "routingMethod": "sharedLayer4", + "legacy": false + } + ], + "clusters": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/clusters", + "nodes": "http://localhost:8080/zone/v2/prod/us-central-1/nodes/v2/node/?recursive=true&application=tenant1.application1.instance1", + "yamasUrl": "http://monitoring-system.test/?environment=prod®ion=us-central-1&application=tenant1.application1.instance1", + "version": "6.1.0", + "revision": "1.0.1-commit1", + "deployTimeEpochMs": 1600000000000, + "screwdriverId": "123", + "endpointStatus": [ + { + "endpointId": "default", + "rotationId": "rotation-id-1", + "clusterId": "foo", + "status": "UNKNOWN", + "lastUpdated": 0 + } + ], + "applicationVersion": { + "build": 1, + "compileVersion": "6.1.0", + "sourceUrl": "repository1/tree/commit1", + "commit": "commit1" + }, + "status": "complete", + "quota": 1.062, + "activity": { + "lastQueried": 1527848130000, + "lastWritten": 1527848130000, + "lastQueriesPerSecond": 1.0, + "lastWritesPerSecond": 2.0 + }, + "metrics": { + "queriesPerSecond": 1.0, + "writesPerSecond": 2.0, + "documentCount": 3.0, + "queryLatencyMillis": 4.0, + "writeLatencyMillis": 5.0, + "lastUpdated": 123123 + } + }, { "environment": "prod", "region": "us-east-3" @@ -52,7 +164,8 @@ "region": "us-west-1" } ], - "pemDeployKeys": [], + "pemDeployKeys": [ + ], "metrics": { "queryServiceQuality": 0.5, "writeServiceQuality": 0.7 diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/jobs.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/jobs.json index e8c2660f999..12430b67539 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/jobs.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/jobs.json @@ -6,8 +6,8 @@ { "id": 2, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/run/2", - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success", "versions": { "targetPlatform": "6.1.0", @@ -15,7 +15,7 @@ "build": 1, "compileVersion": "6.1.0" }, - "sourcePlatform":"6.1.0", + "sourcePlatform": "6.1.0", "sourceApplication": { "build": 1, "compileVersion": "6.1.0" @@ -39,8 +39,8 @@ { "id": 1, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/run/1", - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success", "versions": { "targetPlatform": "6.1.0", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-applicationPackage.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-applicationPackage.json index c0833ae0f05..82725213aaa 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-applicationPackage.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-applicationPackage.json @@ -1,14 +1,14 @@ { "notifications": [ { - "at": "(ignore)", + "at": 1600000000000, "level": "warning", "type": "applicationPackage", "tenant": "tenant1", "application": "app1" }, { - "at": "(ignore)", + "at": 1600000000000, "level": "warning", "type": "applicationPackage", "tenant": "tenant2", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-tenant1-app2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-tenant1-app2.json index 277831f2a9f..556440c40d5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-tenant1-app2.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-tenant1-app2.json @@ -1,7 +1,7 @@ { "notifications": [ { - "at": "(ignore)", + "at": 1600000000000, "level": "error", "type": "deployment", "messages": [ diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-tenant1.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-tenant1.json index 33755843486..1a731dfe4a9 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-tenant1.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/notifications-tenant1.json @@ -1,7 +1,7 @@ { "notifications": [ { - "at": "(ignore)", + "at": 1600000000000, "level": "warning", "type": "applicationPackage", "messages": [ @@ -10,7 +10,7 @@ "application": "app1" }, { - "at": "(ignore)", + "at": 1600000000000, "level": "error", "type": "deployment", "messages": [ diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json index 99ab2b34615..b7157f842a6 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/recursive-root.json @@ -1,5 +1,222 @@ - [ - @include(tenant1-recursive.json), - @include(tenant2.json) + { + "tenant": "tenant1", + "type": "ATHENS", + "athensDomain": "domain1", + "property": "property1", + "applications": [ + { + "tenant": "tenant1", + "application": "application1", + "instance": "instance1", + "deployments": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/", + "sourceUrl": "repository1/tree/commit1", + "commit": "commit1", + "projectId": 123, + "deploying": { + "revision": { + "build": 1, + "compileVersion": "6.1.0", + "sourceUrl": "repository1/tree/commit1", + "commit": "commit1" + } + }, + "changeBlockers": [ + { + "versions": true, + "revisions": false, + "timeZone": "UTC", + "days": [ + 1, + 2, + 3, + 4, + 5 + ], + "hours": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8 + ] + } + ], + "rotationId": "rotation-id-1", + "instances": [ + { + "tenant": "tenant1", + "application": "application1", + "instance": "instance1", + "environment": "dev", + "region": "us-east-1", + "endpoints": [ + { + "cluster": "default", + "tls": true, + "url": "https://instance1.application1.tenant1.us-east-1.dev.vespa.oath.cloud/", + "scope": "zone", + "routingMethod": "sharedLayer4", + "legacy": false + } + ], + "clusters": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/dev/region/us-east-1/clusters", + "nodes": "http://localhost:8080/zone/v2/dev/us-east-1/nodes/v2/node/?recursive=true&application=tenant1.application1.instance1", + "yamasUrl": "http://monitoring-system.test/?environment=dev®ion=us-east-1&application=tenant1.application1.instance1", + "version": "6.1.0", + "revision": "1.0.1", + "deployTimeEpochMs": 1600000000000, + "screwdriverId": "123", + "status": "complete", + "quota": 1.062, + "activity": { + "lastQueried": 1527848130000, + "lastWritten": 1527848130000, + "lastQueriesPerSecond": 1.0, + "lastWritesPerSecond": 2.0 + }, + "metrics": { + "queriesPerSecond": 1.0, + "writesPerSecond": 2.0, + "documentCount": 3.0, + "queryLatencyMillis": 4.0, + "writeLatencyMillis": 5.0, + "lastUpdated": 123123 + } + }, + { + "bcpStatus": { + "rotationStatus": "UNKNOWN" + }, + "tenant": "tenant1", + "application": "application1", + "instance": "instance1", + "environment": "prod", + "region": "us-central-1", + "endpoints": [ + { + "cluster": "default", + "tls": true, + "url": "https://instance1.application1.tenant1.us-central-1.vespa.oath.cloud/", + "scope": "zone", + "routingMethod": "sharedLayer4", + "legacy": false + }, + { + "cluster": "foo", + "tls": true, + "url": "https://instance1.application1.tenant1.global.vespa.oath.cloud/", + "scope": "global", + "routingMethod": "sharedLayer4", + "legacy": false + }, + { + "cluster": "foo", + "tls": true, + "url": "https://a0.application1.tenant1.us-central-1-r.vespa.oath.cloud/", + "scope": "application", + "routingMethod": "sharedLayer4", + "legacy": false + } + ], + "clusters": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/clusters", + "nodes": "http://localhost:8080/zone/v2/prod/us-central-1/nodes/v2/node/?recursive=true&application=tenant1.application1.instance1", + "yamasUrl": "http://monitoring-system.test/?environment=prod®ion=us-central-1&application=tenant1.application1.instance1", + "version": "6.1.0", + "revision": "1.0.1-commit1", + "deployTimeEpochMs": 1600000000000, + "screwdriverId": "123", + "endpointStatus": [ + { + "endpointId": "default", + "rotationId": "rotation-id-1", + "clusterId": "foo", + "status": "UNKNOWN", + "lastUpdated": 0 + } + ], + "applicationVersion": { + "build": 1, + "compileVersion": "6.1.0", + "sourceUrl": "repository1/tree/commit1", + "commit": "commit1" + }, + "status": "complete", + "quota": 1.062, + "activity": { + "lastQueried": 1527848130000, + "lastWritten": 1527848130000, + "lastQueriesPerSecond": 1.0, + "lastWritesPerSecond": 2.0 + }, + "metrics": { + "queriesPerSecond": 1.0, + "writesPerSecond": 2.0, + "documentCount": 3.0, + "queryLatencyMillis": 4.0, + "writeLatencyMillis": 5.0, + "lastUpdated": 123123 + } + }, + { + "environment": "prod", + "region": "us-east-3" + }, + { + "environment": "prod", + "region": "us-west-1" + } + ], + "pemDeployKeys": [ + ], + "metrics": { + "queryServiceQuality": 0.5, + "writeServiceQuality": 0.7 + }, + "activity": { + "lastQueried": 1527848130000, + "lastWritten": 1527848130000, + "lastQueriesPerSecond": 1.0, + "lastWritesPerSecond": 2.0 + }, + "ownershipIssueId": "321", + "owner": "owner-username", + "deploymentIssueId": "123" + } + ], + "metaData": { + "createdAtMillis": 1600000000000, + "lastDeploymentToDevMillis": 1600000000000, + "lastSubmissionToProdMillis": 1000 + } + }, + { + "tenant": "tenant2", + "type": "ATHENS", + "athensDomain": "domain2", + "property": "property2", + "propertyId": "1234", + "propertyUrl": "www.properties.tld/1234", + "contactsUrl": "www.contacts.tld/1234", + "issueCreationUrl": "www.issues.tld/1234", + "contacts": [ + [ + "alice" + ], + [ + "bob" + ] + ], + "applications": [ + ], + "metaData": { + "createdAtMillis": 1600000000000, + "lastLoginByUserMillis": 1234, + "lastLoginByAdministratorMillis": 1234 + } + } ] 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 e8f7839e7cd..41c5e9d1c8a 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,46 @@ [ - @include(tenant-with-application-with-metadata.json), - @include(tenant2.json) + { + "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": { + "createdAtMillis": 1600000000000, + "lastDeploymentToDevMillis": 1600000000000, + "lastSubmissionToProdMillis": 1000 + } + }, + { + "tenant": "tenant2", + "type": "ATHENS", + "athensDomain": "domain2", + "property": "property2", + "propertyId": "1234", + "propertyUrl": "www.properties.tld/1234", + "contactsUrl": "www.contacts.tld/1234", + "issueCreationUrl": "www.issues.tld/1234", + "contacts": [ + [ + "alice" + ], + [ + "bob" + ] + ], + "applications": [ + ], + "metaData": { + "createdAtMillis": 1600000000000, + "lastLoginByUserMillis": 1234, + "lastLoginByAdministratorMillis": 1234 + } + } ] - diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/root.json index d63a7ba7d56..224b38f5f19 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/root.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/root.json @@ -1,7 +1,7 @@ { - "resources":[ + "resources": [ { - "url":"http://localhost:8080/application/v4/tenant/" + "url": "http://localhost:8080/application/v4/tenant/" } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/service.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/service.json index 8fb64d65ff8..81892fd547e 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/service.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/service.json @@ -4,4 +4,4 @@ "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-west-1/instance/default/service/filedistributorservice-dud1f4w037qdxdrn0ovxfdtgw/state/v1/config" } ] -}
\ No newline at end of file +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/suspended.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/suspended.json index a360474da49..0b855edb2b2 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/suspended.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/suspended.json @@ -1,3 +1,3 @@ { - "suspended":false -}
\ No newline at end of file + "suspended": false +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json index e830f96bbba..83a09e8a3f3 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json @@ -4,351 +4,351 @@ "log": { "deployTester": [ { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Deploying the tester container on platform 6.1 ..." }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Deployment successful." }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "foo" } ], "installTester": [ { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Tester container successfully installed!" } ], "deployReal": [ { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Deploying platform version 6.1 and application version 1.0.1-commit1 ..." }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Deployment successful." }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "foo" } ], "installReal": [ { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "######## Details for all nodes ########" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Waiting for convergence of 1 services across 1 nodes" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "1 application services upgrading" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Waiting for convergence of 1 services across 1 nodes" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "1 application services upgrading" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Waiting for convergence of 1 services across 1 nodes" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "1 application services upgrading" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Waiting for convergence of 1 services across 1 nodes" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "1 application services upgrading" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Waiting for convergence of 1 services across 1 nodes" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "1 application services upgrading" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Waiting for convergence of 1 services across 1 nodes" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "1 application services upgrading" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- platform vespa/vespa:6.1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "debug", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Found endpoints:" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "- test.us-east-1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": " |-- https://instance1.application1.tenant1.us-east-1.test.vespa.oath.cloud/ (cluster 'default')" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Installation succeeded!" } ], "startTests": [ { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Attempting to find endpoints ..." }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Found endpoints:" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "- test.us-east-1" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": " |-- https://instance1.application1.tenant1.us-east-1.test.vespa.oath.cloud/ (cluster 'default')" }, { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Starting tests ..." } ], "endTests": [ { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Tests completed successfully." } ], "deactivateReal": [ { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Deactivating deployment of tenant1.application1.instance1 in test.us-east-1 ..." } ], "deactivateTester": [ { - "at": "(ignore)", + "at": 1600000000000, "type": "info", "message": "Deactivating tester of tenant1.application1.instance1 in test.us-east-1 ..." } @@ -358,43 +358,43 @@ "steps": { "deployTester": { "status": "succeeded", - "startMillis": "(ignore)" + "startMillis": 1600000000000 }, "installTester": { "status": "succeeded", - "startMillis": "(ignore)" + "startMillis": 1600000000000 }, "deployReal": { "status": "succeeded", - "startMillis": "(ignore)" + "startMillis": 1600000000000 }, "installReal": { "status": "succeeded", - "startMillis": "(ignore)" + "startMillis": 1600000000000 }, "startTests": { "status": "succeeded", - "startMillis": "(ignore)" + "startMillis": 1600000000000 }, "endTests": { "status": "succeeded", - "startMillis": "(ignore)" + "startMillis": 1600000000000 }, "copyVespaLogs": { "status": "succeeded", - "startMillis": "(ignore)" + "startMillis": 1600000000000 }, "deactivateReal": { "status": "succeeded", - "startMillis": "(ignore)" + "startMillis": 1600000000000 }, "deactivateTester": { "status": "succeeded", - "startMillis": "(ignore)" + "startMillis": 1600000000000 }, "report": { "status": "succeeded", - "startMillis": "(ignore)" + "startMillis": 1600000000000 } } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-job.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-job.json index c0988e8c301..1ac4658ce10 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-job.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-job.json @@ -3,7 +3,7 @@ { "id": 2, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/system-test/run/2", - "start": "(ignore)", + "start": 1600000000000, "status": "running", "versions": { "targetPlatform": "6.1.0", @@ -60,8 +60,8 @@ { "id": 1, "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/system-test/run/1", - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success", "versions": { "targetPlatform": "6.1.0", 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 b02b1ea2565..006e5158168 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 @@ -6,12 +6,12 @@ "applications": [ { "tenant": "tenant1", - "application":"application1", - "instance":"instance1", - "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1" + "application": "application1", + "instance": "instance1", + "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1" } ], "metaData": { - "createdAtMillis": "(ignore)" + "createdAtMillis": 1600000000000 } } 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 index 58c76b8227e..d08cd640890 100644 --- 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 @@ -10,7 +10,7 @@ "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1" } ], - "metaData":{ - "createdAtMillis": "(ignore)" + "metaData": { + "createdAtMillis": 1600000000000 } } 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 bd77a68a1eb..706fc637e50 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,8 +4,9 @@ "athensDomain": "domain2", "property": "property2", "propertyId": "1234", - "applications": [], + "applications": [ + ], "metaData": { - "createdAtMillis": "(ignore)" + "createdAtMillis": 1600000000000 } } 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 33ed505ce35..78e7d740d3b 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 @@ -3,8 +3,9 @@ "type": "ATHENS", "athensDomain": "domain1", "property": "property1", - "applications": [ ], - "metaData":{ - "createdAtMillis": "(ignore)" + "applications": [ + ], + "metaData": { + "createdAtMillis": 1600000000000 } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-deleted.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-deleted.json index 1c4b76932ac..43e3f8c4451 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-deleted.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1-deleted.json @@ -1,9 +1,10 @@ { "tenant": "tenant1", "type": "DELETED", - "applications": [], + "applications": [ + ], "metaData": { - "createdAtMillis": "(ignore)", - "deletedAtMillis": "(ignore)" + "createdAtMillis": 1600000000000, + "deletedAtMillis": 1600000000000 } } 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 551b26c8513..2af5d0a5896 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 @@ -4,11 +4,192 @@ "athensDomain": "domain1", "property": "property1", "applications": [ - @include(instance1-recursive.json) + { + "tenant": "tenant1", + "application": "application1", + "instance": "instance1", + "deployments": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/", + "sourceUrl": "repository1/tree/commit1", + "commit": "commit1", + "projectId": 123, + "deploying": { + "revision": { + "build": 1, + "compileVersion": "6.1.0", + "sourceUrl": "repository1/tree/commit1", + "commit": "commit1" + } + }, + "changeBlockers": [ + { + "versions": true, + "revisions": false, + "timeZone": "UTC", + "days": [ + 1, + 2, + 3, + 4, + 5 + ], + "hours": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8 + ] + } + ], + "rotationId": "rotation-id-1", + "instances": [ + { + "tenant": "tenant1", + "application": "application1", + "instance": "instance1", + "environment": "dev", + "region": "us-east-1", + "endpoints": [ + { + "cluster": "default", + "tls": true, + "url": "https://instance1.application1.tenant1.us-east-1.dev.vespa.oath.cloud/", + "scope": "zone", + "routingMethod": "sharedLayer4", + "legacy": false + } + ], + "clusters": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/dev/region/us-east-1/clusters", + "nodes": "http://localhost:8080/zone/v2/dev/us-east-1/nodes/v2/node/?recursive=true&application=tenant1.application1.instance1", + "yamasUrl": "http://monitoring-system.test/?environment=dev®ion=us-east-1&application=tenant1.application1.instance1", + "version": "6.1.0", + "revision": "1.0.1", + "deployTimeEpochMs": 1600000000000, + "screwdriverId": "123", + "status": "complete", + "quota": 1.062, + "activity": { + "lastQueried": 1527848130000, + "lastWritten": 1527848130000, + "lastQueriesPerSecond": 1.0, + "lastWritesPerSecond": 2.0 + }, + "metrics": { + "queriesPerSecond": 1.0, + "writesPerSecond": 2.0, + "documentCount": 3.0, + "queryLatencyMillis": 4.0, + "writeLatencyMillis": 5.0, + "lastUpdated": 123123 + } + }, + { + "bcpStatus": { + "rotationStatus": "UNKNOWN" + }, + "tenant": "tenant1", + "application": "application1", + "instance": "instance1", + "environment": "prod", + "region": "us-central-1", + "endpoints": [ + { + "cluster": "default", + "tls": true, + "url": "https://instance1.application1.tenant1.us-central-1.vespa.oath.cloud/", + "scope": "zone", + "routingMethod": "sharedLayer4", + "legacy": false + }, + { + "cluster": "foo", + "tls": true, + "url": "https://instance1.application1.tenant1.global.vespa.oath.cloud/", + "scope": "global", + "routingMethod": "sharedLayer4", + "legacy": false + }, + { + "cluster": "foo", + "tls": true, + "url": "https://a0.application1.tenant1.us-central-1-r.vespa.oath.cloud/", + "scope": "application", + "routingMethod": "sharedLayer4", + "legacy": false + } + ], + "clusters": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/clusters", + "nodes": "http://localhost:8080/zone/v2/prod/us-central-1/nodes/v2/node/?recursive=true&application=tenant1.application1.instance1", + "yamasUrl": "http://monitoring-system.test/?environment=prod®ion=us-central-1&application=tenant1.application1.instance1", + "version": "6.1.0", + "revision": "1.0.1-commit1", + "deployTimeEpochMs": 1600000000000, + "screwdriverId": "123", + "endpointStatus": [ + { + "endpointId": "default", + "rotationId": "rotation-id-1", + "clusterId": "foo", + "status": "UNKNOWN", + "lastUpdated": 0 + } + ], + "applicationVersion": { + "build": 1, + "compileVersion": "6.1.0", + "sourceUrl": "repository1/tree/commit1", + "commit": "commit1" + }, + "status": "complete", + "quota": 1.062, + "activity": { + "lastQueried": 1527848130000, + "lastWritten": 1527848130000, + "lastQueriesPerSecond": 1.0, + "lastWritesPerSecond": 2.0 + }, + "metrics": { + "queriesPerSecond": 1.0, + "writesPerSecond": 2.0, + "documentCount": 3.0, + "queryLatencyMillis": 4.0, + "writeLatencyMillis": 5.0, + "lastUpdated": 123123 + } + }, + { + "environment": "prod", + "region": "us-east-3" + }, + { + "environment": "prod", + "region": "us-west-1" + } + ], + "pemDeployKeys": [ + ], + "metrics": { + "queryServiceQuality": 0.5, + "writeServiceQuality": 0.7 + }, + "activity": { + "lastQueried": 1527848130000, + "lastWritten": 1527848130000, + "lastQueriesPerSecond": 1.0, + "lastWritesPerSecond": 2.0 + }, + "ownershipIssueId": "321", + "owner": "owner-username", + "deploymentIssueId": "123" + } ], "metaData": { - "createdAtMillis": "(ignore)", - "lastDeploymentToDevMillis": "(ignore)", + "createdAtMillis": 1600000000000, + "lastDeploymentToDevMillis": 1600000000000, "lastSubmissionToProdMillis": 1000 } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1.json index a105a194974..83c81a0f00f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant1.json @@ -3,8 +3,9 @@ "type": "ATHENS", "athensDomain": "domain2", "property": "property1", - "applications": [], + "applications": [ + ], "metaData": { - "createdAtMillis": "(ignore)" + "createdAtMillis": 1600000000000 } } 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 497d80c96a5..fae76cc0fe2 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,10 +15,11 @@ "bob" ] ], - "applications": [], + "applications": [ + ], "metaData": { - "createdAtMillis": "(ignore)", + "createdAtMillis": 1600000000000, "lastLoginByUserMillis": 1234, "lastLoginByAdministratorMillis": 1234 } -}
\ No newline at end of file +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/athensDomain-list.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/athensDomain-list.json index 913b8fab62f..9a456fd0433 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/athensDomain-list.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/athensDomain-list.json @@ -4,4 +4,4 @@ "domain2", "vespa.vespa.tenants.sandbox" ] -}
\ No newline at end of file +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/property-list.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/property-list.json index 596dea037bd..2931fc8b162 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/property-list.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/property-list.json @@ -1,6 +1,12 @@ { "properties": [ - {"propertyid": "1234", "property": "foo"}, - {"propertyid": "4321", "property": "bar"} + { + "propertyid": "1234", + "property": "foo" + }, + { + "propertyid": "4321", + "property": "bar" + } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/root.json index 1947a27467f..737991f29c9 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/root.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/responses/root.json @@ -1,10 +1,10 @@ { - "resources":[ + "resources": [ { - "url":"http://localhost:8080/athenz/v1/domains/" + "url": "http://localhost:8080/athenz/v1/domains/" }, { - "url":"http://localhost:8080/athenz/v1/properties/" + "url": "http://localhost:8080/athenz/v1/properties/" } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-tenants.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-tenants.json index 5c61dc6e86e..59c08dcbb36 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-tenants.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-tenants.json @@ -1,58 +1,60 @@ { - "until":"2020-05-28", - "tenants":[ - { - "tenant":"tenant1", - "plan":"some-plan", - "planName":"Plan with id: some-plan", - "collection": "AUTO", - "current":{ - "amount":"123.00", - "status":"accrued", - "from":"2020-05-23", - "items":[ - { - "id":"some-id", - "description":"description", - "amount":"123.00", - "plan":"some-plan", - "planName":"Plan with id: some-plan" - } - ] - }, - "additional": - { - "items":[ - { - "id":"line-item-id", - "description":"support", - "amount":"42.00", - "plan":"some-plan", - "planName":"Plan with id: some-plan" - } - ] - } - }, - { - "tenant":"tenant2", - "plan":"some-plan", - "planName":"Plan with id: some-plan", - "collection": "AUTO", - "current":{ - "amount":"123.00", - "status":"accrued", - "from":"2020-05-23", - "items":[ - { - "id":"some-id", - "description":"description", - "amount":"123.00", - "plan":"some-plan", - "planName":"Plan with id: some-plan" - } - ] - }, - "additional":{"items":[]} - } - ] -}
\ No newline at end of file + "until": "2020-05-28", + "tenants": [ + { + "tenant": "tenant1", + "plan": "some-plan", + "planName": "Plan with id: some-plan", + "collection": "AUTO", + "current": { + "amount": "123.00", + "status": "accrued", + "from": "2020-05-23", + "items": [ + { + "id": "some-id", + "description": "description", + "amount": "123.00", + "plan": "some-plan", + "planName": "Plan with id: some-plan" + } + ] + }, + "additional": { + "items": [ + { + "id": "line-item-id", + "description": "support", + "amount": "42.00", + "plan": "some-plan", + "planName": "Plan with id: some-plan" + } + ] + } + }, + { + "tenant": "tenant2", + "plan": "some-plan", + "planName": "Plan with id: some-plan", + "collection": "AUTO", + "current": { + "amount": "123.00", + "status": "accrued", + "from": "2020-05-23", + "items": [ + { + "id": "some-id", + "description": "description", + "amount": "123.00", + "plan": "some-plan", + "planName": "Plan with id: some-plan" + } + ] + }, + "additional": { + "items": [ + ] + } + } + ] +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/invoice-creation-response.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/invoice-creation-response.json index fe9e8486e9b..49fde010c58 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/invoice-creation-response.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/invoice-creation-response.json @@ -1 +1,4 @@ -{"message":"Created invoice with ID id-123","id":"id-123"}
\ No newline at end of file +{ + "message": "Created invoice with ID id-123", + "id": "id-123" +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/line-item-list.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/line-item-list.json index 98c2046afd8..e8404b12dd8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/line-item-list.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/line-item-list.json @@ -1,11 +1,11 @@ { - "lineItems":[ - { - "id":"line-item-id", - "description":"some description", - "amount":"123.45", - "plan":"some-plan", - "planName":"Plan with id: some-plan" - } - ] -}
\ No newline at end of file + "lineItems": [ + { + "id": "line-item-id", + "description": "some description", + "amount": "123.45", + "plan": "some-plan", + "planName": "Plan with id: some-plan" + } + ] +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/tenant-billing-view.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/tenant-billing-view.json index e5588c45677..3e505df7a1c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/tenant-billing-view.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/tenant-billing-view.json @@ -1,45 +1,48 @@ { - "until":"2020-05-28", - "plan":"some-plan", - "planName":"Plan with id: some-plan", - "current":{ - "amount":"123.00", - "status":"accrued", - "from":"2020-05-23", - "items":[ - { - "id":"some-id", - "description":"description", - "amount":"123.00", - "plan":"some-plan", - "planName":"Plan with id: some-plan" - } - ] - }, - "additional":{"items":[]}, - "bills":[ + "until": "2020-05-28", + "plan": "some-plan", + "planName": "Plan with id: some-plan", + "current": { + "amount": "123.00", + "status": "accrued", + "from": "2020-05-23", + "items": [ + { + "id": "some-id", + "description": "description", + "amount": "123.00", + "plan": "some-plan", + "planName": "Plan with id: some-plan" + } + ] + }, + "additional": { + "items": [ + ] + }, + "bills": [ + { + "id": "id-1", + "from": "2020-05-23", + "to": "2020-05-28", + "amount": "123.00", + "status": "OPEN", + "statusHistory": [ { - "id":"id-1", - "from":"2020-05-23", - "to":"2020-05-28", - "amount":"123.00", - "status":"OPEN", - "statusHistory":[ - { - "at":"2020-05-23", - "status":"OPEN" - } - ], - "items":[ - { - "id":"some-id", - "description":"description", - "amount":"123.00", - "plan":"some-plan", - "planName":"Plan with id: some-plan" - } - ] + "at": "2020-05-23", + "status": "OPEN" } - ], - "collection":"AUTO" -}
\ No newline at end of file + ], + "items": [ + { + "id": "some-id", + "description": "description", + "amount": "123.00", + "plan": "some-plan", + "planName": "Plan with id: some-plan" + } + ] + } + ], + "collection": "AUTO" +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/initial.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/initial.json index cf349e06cff..1fb8ad8be17 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/initial.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/initial.json @@ -24,4 +24,4 @@ } ] } -}
\ No newline at end of file +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmrs.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmrs.json index 54d4ea8bcbd..4ae079ebfb4 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmrs.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/responses/vcmrs.json @@ -37,4 +37,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json index 0dad88e645b..79e11fa1140 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json @@ -85,7 +85,7 @@ "name": "ResourceTagMaintainer" }, { - "name":"RetriggerMaintainer" + "name": "RetriggerMaintainer" }, { "name": "SystemRoutingPolicyMaintainer" @@ -94,7 +94,7 @@ "name": "SystemUpgrader" }, { - "name":"TenantRoleMaintainer" + "name": "TenantRoleMaintainer" }, { "name": "TrafficShareUpdater" diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/metering.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/metering.json index 1008ada6def..cf7738efe7f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/metering.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/metering.json @@ -6,7 +6,7 @@ "cpu": 12.0, "memory": 48.0, "disk": 1200.0, - "architecture":"arm64" + "architecture": "arm64" }, { "applicationId": "tenant.app.instance", @@ -15,6 +15,6 @@ "cpu": 24.0, "memory": 96.0, "disk": 2400.0, - "architecture":"x86_64" + "architecture": "x86_64" } -]
\ No newline at end of file +] diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/stats.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/stats.json index 1c9230798dd..673767c13a0 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/stats.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/stats.json @@ -61,4 +61,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json index a707b9c7bc0..31962e84832 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json @@ -7,8 +7,10 @@ "date": 0, "controllerVersion": false, "systemVersion": false, - "configServers": [], - "failingApplications": [], + "configServers": [ + ], + "failingApplications": [ + ], "productionApplications": [ { "tenant": "tenant1", @@ -29,7 +31,8 @@ "productionSuccesses": 1 } ], - "deployingApplications": [], + "deployingApplications": [ + ], "applications": [ { "tenant": "tenant1", @@ -40,11 +43,11 @@ "jobs": [ { "name": "system-test", - "coolingDownUntil": "(ignore)" + "coolingDownUntil": 1600000000000 }, { "name": "staging-test", - "coolingDownUntil": "(ignore)" + "coolingDownUntil": 1600000000000 }, { "name": "production-us-west-1" @@ -54,8 +57,8 @@ "production-us-west-1": { "success": { "number": 1, - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success" } } @@ -64,8 +67,8 @@ "production-us-west-1": { "success": { "number": 1, - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success" } } @@ -86,8 +89,8 @@ "production-us-west-1": { "success": { "number": 1, - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success" } } @@ -96,8 +99,8 @@ "production-us-west-1": { "success": { "number": 1, - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success" } } @@ -187,12 +190,12 @@ "jobs": [ { "name": "system-test", - "coolingDownUntil": "(ignore)", + "coolingDownUntil": 1600000000000, "pending": "application" }, { "name": "staging-test", - "coolingDownUntil": "(ignore)", + "coolingDownUntil": 1600000000000, "pending": "platform" }, { @@ -204,26 +207,26 @@ "system-test": { "failing": { "number": 2, - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "error" }, "running": { "number": 3, - "start": "(ignore)", + "start": 1600000000000, "status": "running" } }, "staging-test": { "failing": { "number": 2, - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "error" }, "running": { "number": 3, - "start": "(ignore)", + "start": 1600000000000, "status": "running" } } @@ -232,26 +235,26 @@ "system-test": { "failing": { "number": 2, - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "error" }, "running": { "number": 3, - "start": "(ignore)", + "start": 1600000000000, "status": "running" } }, "staging-test": { "failing": { "number": 2, - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "error" }, "running": { "number": 3, - "start": "(ignore)", + "start": 1600000000000, "status": "running" } } @@ -266,7 +269,7 @@ "jobs": [ { "name": "system-test", - "coolingDownUntil": "(ignore)", + "coolingDownUntil": 1600000000000, "pending": "application" }, { @@ -282,35 +285,37 @@ "system-test": { "failing": { "number": 3, - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "error" } }, "staging-test": { "running": { "number": 3, - "start": "(ignore)", + "start": 1600000000000, "status": "running" } }, "production-us-west-1": { "success": { "number": 2, - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success" } } }, "upgradeRuns": { - "system-test": {}, - "staging-test": {}, + "system-test": { + }, + "staging-test": { + }, "production-us-west-1": { "success": { "number": 2, - "start": "(ignore)", - "end": "(ignore)", + "start": 1600000000000, + "end": 1600000000000, "status": "success" } } @@ -332,7 +337,7 @@ "production-us-west-1": { "running": { "number": 2, - "start": "(ignore)", + "start": 1600000000000, "status": "running" } } @@ -341,7 +346,7 @@ "production-us-west-1": { "running": { "number": 2, - "start": "(ignore)", + "start": 1600000000000, "status": "running" } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json index 4e026a2c881..12fd008d53b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json @@ -164,7 +164,8 @@ "upgradeBudget": "PT24H", "scheduledAt": 1234, "cloud": "cloud2", - "nodes": [] + "nodes": [ + ] } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-in.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-in.json index 59519c33d06..5301e8398eb 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-in.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-in.json @@ -7,7 +7,7 @@ "region": "us-west-1", "status": "in", "agent": "operator", - "changedAt": "(ignore)" + "changedAt": 1600000000000 } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-initial.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-initial.json index e95d9bcdc42..5383eb7f806 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-initial.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-initial.json @@ -7,7 +7,7 @@ "region": "us-west-1", "status": "in", "agent": "system", - "changedAt": "(ignore)" + "changedAt": 0 } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-out.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-out.json index 49b85775e63..889aa199279 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-out.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/deployment-status-out.json @@ -7,7 +7,7 @@ "region": "us-west-1", "status": "out", "agent": "operator", - "changedAt": "(ignore)" + "changedAt": 1600000000000 } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-in.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-in.json index abf0a46ae3e..0aa6d79ee63 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-in.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-in.json @@ -4,5 +4,5 @@ "region": "us-west-1", "status": "in", "agent": "operator", - "changedAt": "(ignore)" + "changedAt": 1600000000000 } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-initial.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-initial.json index 8328e1ffab1..cb3fb75f5cb 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-initial.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-initial.json @@ -4,5 +4,5 @@ "region": "us-west-1", "status": "in", "agent": "system", - "changedAt": "(ignore)" + "changedAt": 0 } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-out.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-out.json index d86ca2d56e6..1602ca76a9d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-out.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/policy/zone-status-out.json @@ -4,5 +4,5 @@ "region": "us-west-1", "status": "out", "agent": "operator", - "changedAt": "(ignore)" + "changedAt": 1600000000000 } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/application.json index 06fb2b92c53..77c5d544f6d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/application.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/application.json @@ -7,7 +7,7 @@ "region": "us-east-3", "status": "in", "agent": "unknown", - "changedAt": "(ignore)" + "changedAt": 1497618757000 }, { "routingMethod": "sharedLayer4", @@ -16,7 +16,7 @@ "region": "us-west-1", "status": "in", "agent": "unknown", - "changedAt": "(ignore)" + "changedAt": 1497618757000 } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/tenant.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/tenant.json index 5de12d9b1ec..6ff308679f6 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/tenant.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/recursion/tenant.json @@ -7,7 +7,7 @@ "region": "us-east-3", "status": "in", "agent": "unknown", - "changedAt": "(ignore)" + "changedAt": 1497618757000 }, { "routingMethod": "sharedLayer4", @@ -16,7 +16,7 @@ "region": "us-west-1", "status": "in", "agent": "unknown", - "changedAt": "(ignore)" + "changedAt": 1497618757000 }, { "routingMethod": "sharedLayer4", @@ -25,7 +25,7 @@ "region": "us-east-3", "status": "in", "agent": "unknown", - "changedAt": "(ignore)" + "changedAt": 1497618757000 }, { "routingMethod": "sharedLayer4", @@ -34,7 +34,7 @@ "region": "us-west-1", "status": "in", "agent": "unknown", - "changedAt": "(ignore)" + "changedAt": 1497618757000 } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-in.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-in.json index 4eb51c1e907..e7c4f5842f5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-in.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-in.json @@ -7,7 +7,7 @@ "region": "us-west-1", "status": "in", "agent": "operator", - "changedAt": "(ignore)" + "changedAt": 1600000000000 } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-initial.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-initial.json index 615ce4b4a6e..4a774c7b850 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-initial.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-initial.json @@ -7,7 +7,7 @@ "region": "us-west-1", "status": "in", "agent": "unknown", - "changedAt": "(ignore)" + "changedAt": 1497618757000 } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-out.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-out.json index 816bc810048..16ac4eb907d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-out.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/deployment-status-out.json @@ -7,7 +7,7 @@ "region": "us-west-1", "status": "out", "agent": "operator", - "changedAt": "(ignore)" + "changedAt": 1600000000000 } ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-in.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-in.json index 8460cc5ec8a..a6b873b5be5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-in.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-in.json @@ -4,5 +4,5 @@ "region": "us-west-1", "status": "in", "agent": "operator", - "changedAt": "(ignore)" + "changedAt": 0 } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-initial.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-initial.json index 8460cc5ec8a..a6b873b5be5 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-initial.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-initial.json @@ -4,5 +4,5 @@ "region": "us-west-1", "status": "in", "agent": "operator", - "changedAt": "(ignore)" + "changedAt": 0 } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-out.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-out.json index 88fddcbd955..3fd71a731eb 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-out.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/rotation/zone-status-out.json @@ -4,5 +4,5 @@ "region": "us-west-1", "status": "out", "agent": "operator", - "changedAt": "(ignore)" + "changedAt": 0 } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiOnPremTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiOnPremTest.java index cdf3674633c..7285c543899 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiOnPremTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiOnPremTest.java @@ -58,7 +58,7 @@ public class UserApiOnPremTest extends ControllerContainerTest { .forEach(d -> d.admin(AthenzIdentities.from("domain1.bob"))); tester.assertResponse(createUserRequest(user, operator), - new File("user-without-applications.json")); + new File("on-prem-user-without-applications.json")); tester.assertResponse(createUserRequest(user, tenantAdmin), new File("user-with-applications-athenz.json")); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-roles.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-roles.json index ca437dba761..6fbd37cd5c9 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-roles.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-roles.json @@ -1,19 +1,22 @@ { "tenant": "my-tenant", "application": "my-app", - "roleNames": [], + "roleNames": [ + ], "users": [ { "name": "administrator@tenant", "email": "administrator@tenant", "verified": false, - "roles": {} + "roles": { + } }, { "name": "developer@tenant", "email": "developer@tenant", "verified": false, - "roles": {} + "roles": { + } } ] -}
\ No newline at end of file +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/first-developer-key.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/first-developer-key.json index b7d48f283f3..dffb0c90df1 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/first-developer-key.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/first-developer-key.json @@ -6,4 +6,3 @@ } ] } - diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/on-prem-user-without-applications.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/on-prem-user-without-applications.json new file mode 100644 index 00000000000..6131da17e33 --- /dev/null +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/on-prem-user-without-applications.json @@ -0,0 +1,28 @@ +{ + "isPublic": false, + "isCd": false, + "hasTrialCapacity": true, + "user": { + "name": "Joe Developer", + "email": "dev@domail", + "nickname": "dev", + "verified": false + }, + "tenants": { + }, + "operator": [ + "hostedOperator", + "hostedSupporter", + "hostedAccountant" + ], + "flags": [ + { + "id": "enable-public-signup-flow", + "rules": [ + { + "value": false + } + ] + } + ] +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-info-after-created.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-info-after-created.json index 56104d626dd..91180ddc7c0 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-info-after-created.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-info-after-created.json @@ -1,8 +1,9 @@ { "name": "", "email": "", - "website":"", + "website": "", "contactName": "administrator", "contactEmail": "administrator@tenant", - "contacts": [] -}
\ No newline at end of file + "contacts": [ + ] +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-roles.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-roles.json index bc921e4bdf4..5aca5de95fc 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-roles.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-roles.json @@ -45,4 +45,4 @@ } } ] -}
\ 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 54585767d51..9b6526e29ad 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 @@ -10,12 +10,15 @@ { "key": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEFELzPyinTfQ/sZnTmRp5E4Ve/sbE\npDhJeqczkyFcT2PysJ5sZwm7rKPEeXDOhzTPCyRvbUqc2SGdWbKUGGa/Yw==\n-----END PUBLIC KEY-----\n", "user": "developer@tenant" - }], - "secretStores": [], + } + ], + "secretStores": [ + ], "integrations": { "aws": { "tenantRole": "my-tenant-tenant-role", - "accounts": [] + "accounts": [ + ] } }, "quota": { @@ -30,7 +33,7 @@ "url": "http://localhost:8080/application/v4/tenant/my-tenant/application/my-app" } ], - "metaData":{ - "createdAtMillis": "(ignore)" + "metaData": { + "createdAtMillis": 1600000000000 } } 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 1cd2fb41263..0cc8ba2cd9e 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 @@ -40,6 +40,6 @@ } ], "metaData": { - "createdAtMillis": "(ignore)" + "createdAtMillis": 1600000000000 } } 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 14b900caf50..9372236faaf 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 @@ -2,12 +2,15 @@ "tenant": "my-tenant", "type": "CLOUD", "creator": "administrator@tenant", - "pemDeveloperKeys": [], - "secretStores": [], + "pemDeveloperKeys": [ + ], + "secretStores": [ + ], "integrations": { "aws": { "tenantRole": "my-tenant-tenant-role", - "accounts": [] + "accounts": [ + ] } }, "quota": { @@ -15,8 +18,9 @@ "budgetUsed": 0.0, "clusterSize": 5 }, - "applications": [], - "metaData":{ - "createdAtMillis": "(ignore)" + "applications": [ + ], + "metaData": { + "createdAtMillis": 1600000000000 } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json index 0211f595ce7..14f78e14c5b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json @@ -1,7 +1,7 @@ { "isPublic": false, "isCd": false, - "hasTrialCapacity": (ignore), + "hasTrialCapacity": true, "user": { "name": "Joe Developer", "email": "dev@domail", @@ -10,7 +10,7 @@ }, "tenants": { "sandbox": { - "supported": (ignore), + "supported": false, "roles": [ "administrator", "developer", @@ -18,7 +18,7 @@ ] }, "tenant1": { - "supported": (ignore), + "supported": false, "roles": [ "administrator", "developer", @@ -26,7 +26,7 @@ ] }, "tenant2": { - "supported": (ignore), + "supported": false, "roles": [ "administrator", "developer", @@ -34,5 +34,14 @@ ] } }, - "flags": [{"id":"enable-public-signup-flow","rules":[{"value":false}]}] + "flags": [ + { + "id": "enable-public-signup-flow", + "rules": [ + { + "value": false + } + ] + } + ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json index 76904bf9bb4..39bdc7cd275 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json @@ -6,7 +6,7 @@ "name": "Joe Developer", "email": "dev@domail", "nickname": "dev", - "verified":false + "verified": false }, "tenants": { "sandbox": { @@ -29,5 +29,14 @@ ] } }, - "flags": [{"id":"enable-public-signup-flow","rules":[{"value":false}]}] + "flags": [ + { + "id": "enable-public-signup-flow", + "rules": [ + { + "value": false + } + ] + } + ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-supported-tenant.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-supported-tenant.json index a40354a9e71..5ae67f19382 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-supported-tenant.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-supported-tenant.json @@ -32,4 +32,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-applications.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-applications.json index 9f9578e6ed8..01cb3f98231 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-applications.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-applications.json @@ -1,18 +1,28 @@ { - "isPublic": (ignore), - "isCd": (ignore), - "hasTrialCapacity": (ignore), + "isPublic": true, + "isCd": false, + "hasTrialCapacity": true, "user": { "name": "Joe Developer", "email": "dev@domail", "nickname": "dev", - "verified":false + "verified": false + }, + "tenants": { }, - "tenants": {}, "operator": [ "hostedOperator", "hostedSupporter", "hostedAccountant" ], - "flags": [{"id":"enable-public-signup-flow","rules":[{"value":false}]}] + "flags": [ + { + "id": "enable-public-signup-flow", + "rules": [ + { + "value": false + } + ] + } + ] } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-trial-capacity-cloud.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-trial-capacity-cloud.json index 2b98a75068a..23528aeab92 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-trial-capacity-cloud.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-trial-capacity-cloud.json @@ -6,8 +6,18 @@ "name": "Joe Developer", "email": "dev@domail", "nickname": "dev", - "verified":false + "verified": false }, - "tenants": {}, - "flags": [{"id":"enable-public-signup-flow","rules":[{"value":false}]}] -}
\ No newline at end of file + "tenants": { + }, + "flags": [ + { + "id": "enable-public-signup-flow", + "rules": [ + { + "value": false + } + ] + } + ] +} |