diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-02-18 22:54:43 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-02-18 22:54:43 +0100 |
commit | 3824687dcc746e5b37700fd19d073a63637f9c1d (patch) | |
tree | a5fda2bc0f81b8a5c933a687b835c5a2f3675b13 /node-repository | |
parent | c3f34b6b1de9836d6d2175757a3081ffcc29a90c (diff) |
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..61214352948 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", normalizedAgentNameUntilV6IsGone(event.agent().name())); } } + /** maven-vespa-plugin @ v6 needs to deserialize nodes w/history. */ + private String normalizedAgentNameUntilV6IsGone(String name) { + return name.equals(Agent.NodeFailer.name()) ? Agent.system.name() : name; + } + private void ipAddressesToSlime(Set<String> ipAddresses, Cursor array) { ipAddresses.forEach(array::addString); } |