diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-06-06 13:03:40 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-06-06 14:50:04 +0200 |
| commit | 55b13778ae37ff4fe0a7747525db71fd9f4b5154 (patch) | |
| tree | bc2b62b1c3ed61a0bf24c76577fbc459d1767d97 /controller-server | |
| parent | f4ecceb450096462c846d58bc27c852e4b9a3c37 (diff) | |
Add deployment activity to application API
Diffstat (limited to 'controller-server')
4 files changed, 18 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 10088ba3fea..d58c3ed7dae 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -468,6 +468,12 @@ public class ApplicationApiHandler extends LoggingRequestHandler { .ifPresent(i -> response.setString("screwdriverId", String.valueOf(i))); sourceRevisionToSlime(deployment.applicationVersion().source(), response); + Cursor activity = response.setObject("activity"); + deployment.activity().lastQueried().ifPresent(instant -> activity.setLong("lastQueried", + instant.toEpochMilli())); + deployment.activity().lastWritten().ifPresent(instant -> activity.setLong("lastWritten", + instant.toEpochMilli())); + // Cost DeploymentCost appCost = deployment.calculateCost(); Cursor costObject = response.setObject("cost"); 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 9174e7dd8b2..79e86b5f7f4 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 @@ -16,6 +16,10 @@ "gitRepository": "repository1", "gitBranch": "master", "gitCommit": "commit1", + "activity": { + "lastQueried": 1527848130000, + "lastWritten": 1527848130000 + }, "cost": { "tco": 74, "waste": 0, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-west-1.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-west-1.json index d13a4dac116..8fccd738554 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-west-1.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-west-1.json @@ -15,8 +15,10 @@ "revision": "(ignore)", "deployTimeEpochMs": "(ignore)", "screwdriverId": "123", - - + "activity": { + "lastQueried": 1527848130000, + "lastWritten": 1527848130000 + }, "cost": { "tco": 74, "waste": 0, diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-corp-us-east-1.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-corp-us-east-1.json index 0f16bee308d..066e840fe16 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-corp-us-east-1.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-corp-us-east-1.json @@ -22,6 +22,10 @@ "gitRepository": "repository1", "gitBranch": "master", "gitCommit": "commit1", + "activity": { + "lastQueried": 1527848130000, + "lastWritten": 1527848130000 + }, "cost": { "tco": 74, "waste": 0, |