Code review feedback.

2 files changed, 12 insertions, 3 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
index 41acec77fe9..8c388fbd4db 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
@@ -196,9 +196,8 @@ public class NodesApiHandler extends LoggingRequestHandler {
     }
 
     private Node.Type nodeTypeFromSlime(Inspector object) {
-        // TODO: Remove this when we are sure type is everywhere.
+        // TODO: Remove this when 6.13 is deployed everywhere.
         if (! object.valid()) {
-            log.severe("Not valid nodeType key, defaulting to tenant.");
             return Node.Type.tenant;
         }
         String typeString = object.asString();
@@ -206,7 +205,7 @@ public class NodesApiHandler extends LoggingRequestHandler {
             case "tenant" : return Node.Type.tenant;
             case "host" : return Node.Type.host;
         }
-        log.severe("Not valid nodeType key, defaulting to tenant: '" + typeString + "'");
+        // TODO: Change this to throw an exception when 6.13 is deployed everywhere.
         return Node.Type.tenant;
     }
 
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 624a6383297..9318c6d0d7b 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
@@ -136,6 +136,7 @@ class NodesResponse extends HttpResponse {
         object.setString("state", NodeStateSerializer.wireNameOf(node.state()));
         object.setString("type", node.type().name());
         object.setString("hostname", node.hostname());
+        object.setString("type", toString(node.type()));
         if (node.parentHostname().isPresent()) {
             object.setString("parentHostname", node.parentHostname().get());
         }
@@ -180,6 +181,15 @@ class NodesResponse extends HttpResponse {
         toSlime(node.history(), object.setArray("history"));
     }
 
+    private String toString(Node.Type type) {
+        switch(type) {
+            case tenant: return "tenant";
+            case host: return "host";
+            default:
+                throw new RuntimeException("New type added to enum, not implemented in NodesResponse: " + type.name());
+        }
+    }
+
     private void toSlime(ApplicationId id, Cursor object) {
         object.setString("tenant", id.tenant().value());
         object.setString("application", id.application().value());