Handle combined cluster type in controller's node-repository client

2 files changed, 2 insertions, 4 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java
index 8bb5775566a..d0e4aa2d7d1 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java
@@ -187,6 +187,7 @@ public class Node {
         admin,
         container,
         content,
+        combined,
         unknown
     }
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
index dd99bef5ee2..6d18c75b952 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
@@ -120,6 +120,7 @@ public interface NodeRepository {
             case "admin": return Node.ClusterType.admin;
             case "content": return Node.ClusterType.content;
             case "container": return Node.ClusterType.container;
+            case "combined": return Node.ClusterType.combined;
         }
         return Node.ClusterType.unknown;
     }
@@ -177,10 +178,6 @@ public interface NodeRepository {
                 : allowedDown ? Node.ServiceState.allowedDown : Node.ServiceState.expectedUp;
     }
 
-    private static boolean toBoolean(Boolean b) {
-        return b == null ? false : b;
-    }
-
     private static double toDouble(Double d) {
         return d == null ? 0 : d;
     }