aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-01-22 16:05:56 +0100
committerJon Marius Venstad <venstad@gmail.com>2020-01-22 16:05:56 +0100
commitc4fa84c7a473f6626534bd5787d18b5cd5955c47 (patch)
tree5b56ad968406462d71b84804a0459e61a323ebbc
parent77d1dde0fdf1f5af7a8ad85de5bb464ef01b1c0e (diff)
Supply failure status in deployment overview
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java1
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json3
2 files changed, 3 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
index 600ad322f84..d27bc581f75 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
@@ -115,6 +115,7 @@ public class DeploymentApiHandler extends LoggingRequestHandler {
Cursor applicationObject = failingArray.addObject();
toSlime(applicationObject, id, request);
applicationObject.setString("failing", firstFailing.id().type().jobName());
+ applicationObject.setString("status", firstFailing.status().name());
});
}
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 d5c881bfe43..2579eede1ae 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
@@ -53,7 +53,8 @@
"instance": "default",
"url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1",
"upgradePolicy": "default",
- "failing": "staging-test"
+ "failing": "staging-test",
+ "status": "error"
}
],
"productionApplications": [