Merge pull request #8546 from vespa-engine/hakonhall/return-system-instead-of-nodefailer-in-rest-api

Return system instead of NodeFailer in REST API

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);
     }