diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-10-10 10:03:08 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2019-10-10 10:03:38 +0200 |
| commit | ff2e84cd05ba1063c677ce4313c3edca902a3d08 (patch) | |
| tree | f325765c8522184cff38c9b55b22105a88ce69f2 /controller-server | |
| parent | c65a072b78328c6eb5826dc490550c217246eb76 (diff) | |
Add rotationId and clusterId fields to endpoint status
Diffstat (limited to 'controller-server')
4 files changed, 10 insertions, 0 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 715d31d129f..f2025235082 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 @@ -995,6 +995,8 @@ public class ApplicationApiHandler extends LoggingRequestHandler { var statusObject = array.addObject(); var targets = status.of(rotation.rotationId()); statusObject.setString("endpointId", rotation.endpointId().id()); + statusObject.setString("rotationId", rotation.rotationId().asString()); + statusObject.setString("clusterId", rotation.clusterId().value()); statusObject.setString("status", rotationStateString(status.of(rotation.rotationId(), deployment))); statusObject.setLong("lastUpdated", targets.lastUpdated().toEpochMilli()); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-without-change-multiple-deployments.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-without-change-multiple-deployments.json index bec264a2053..582753d04d6 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-without-change-multiple-deployments.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-without-change-multiple-deployments.json @@ -222,6 +222,8 @@ "endpointStatus": [ { "endpointId": "default", + "rotationId": "rotation-id-1", + "clusterId": "foo", "status": "IN", "lastUpdated": "(ignore)" } @@ -238,6 +240,8 @@ "endpointStatus": [ { "endpointId": "default", + "rotationId": "rotation-id-1", + "clusterId": "foo", "status": "UNKNOWN", "lastUpdated": "(ignore)" } 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 8af41dc66a1..951b42ff07a 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 @@ -214,6 +214,8 @@ "endpointStatus": [ { "endpointId": "default", + "rotationId": "rotation-id-1", + "clusterId": "foo", "status": "IN", "lastUpdated":"(ignore)" } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json index 7832230d94b..143042e3600 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/prod-us-central-1.json @@ -5,6 +5,8 @@ "endpointStatus": [ { "endpointId": "default", + "rotationId": "rotation-id-1", + "clusterId": "foo", "status": "IN", "lastUpdated": "(ignore)" } |