diff options
author | HÃ¥kon Hallingstad <hakon@oath.com> | 2019-02-18 23:19:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-18 23:19:21 +0100 |
commit | 6b6b1e883e0782c946d212121ef35f40dcb4796a (patch) | |
tree | 2671bfda68ef5f40eb0c49f3ab7562b85b72529b /node-repository | |
parent | 4857bb6f11340e3d2cd0b15ebcdaa9ecb5a6be33 (diff) | |
parent | 7008cc1f6ef39fcf1dce22ca4e02df419e404827 (diff) |
Merge pull request #8546 from vespa-engine/hakonhall/return-system-instead-of-nodefailer-in-rest-api
Return system instead of NodeFailer in REST API
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java index 3b5c264fc09..ba513db5342 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java @@ -12,6 +12,7 @@ import com.yahoo.slime.Slime; import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeRepository; +import com.yahoo.vespa.hosted.provision.node.Agent; import com.yahoo.vespa.hosted.provision.node.History; import com.yahoo.vespa.hosted.provision.node.filter.NodeFilter; import com.yahoo.vespa.orchestrator.Orchestrator; @@ -208,10 +209,15 @@ class NodesResponse extends HttpResponse { Cursor object = array.addObject(); object.setString("event", event.type().name()); object.setLong("at", event.at().toEpochMilli()); - object.setString("agent", event.agent().name()); + object.setString("agent", normalizedAgentUntilV6IsGone(event.agent()).name()); } } + /** maven-vespa-plugin @ v6 needs to deserialize nodes w/history. */ + private Agent normalizedAgentUntilV6IsGone(Agent agent) { + return agent == Agent.NodeFailer ? Agent.system : agent; + } + private void ipAddressesToSlime(Set<String> ipAddresses, Cursor array) { ipAddresses.forEach(array::addString); } |