Revert "Add devhost node type"

4 files changed, 16 insertions, 36 deletions

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index c3e3a2b74f9..d8b17009b65 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -644,8 +644,7 @@
       "public static com.yahoo.config.provision.NodeType valueOf(java.lang.String)",
       "public boolean isDockerHost()",
       "public java.lang.String description()",
-      "public com.yahoo.config.provision.NodeType childNodeType()",
-      "public java.util.List childNodeTypes()"
+      "public com.yahoo.config.provision.NodeType childNodeType()"
     ],
     "fields": [
       "public static final enum com.yahoo.config.provision.NodeType tenant",
@@ -655,8 +654,7 @@
       "public static final enum com.yahoo.config.provision.NodeType config",
       "public static final enum com.yahoo.config.provision.NodeType confighost",
       "public static final enum com.yahoo.config.provision.NodeType controller",
-      "public static final enum com.yahoo.config.provision.NodeType controllerhost",
-      "public static final enum com.yahoo.config.provision.NodeType devhost"
+      "public static final enum com.yahoo.config.provision.NodeType controllerhost"
     ]
   },
   "com.yahoo.config.provision.OutOfCapacityException": {
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java
index 74a14e51122..44bd7ec3708 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java
@@ -1,9 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
-import java.util.List;
-import java.util.Set;
-
 /**
  * The possible types of nodes in the node repository
  * 
@@ -12,42 +9,39 @@ import java.util.Set;
 public enum NodeType {
 
     /** A node to be assigned to a tenant to run application workloads */
-    tenant("Tenant node"),
+    tenant(null, "Tenant node"),
 
     /** A host of a set of (Docker) tenant nodes */
-    host("Tenant docker host", tenant),
+    host(tenant, "Tenant docker host"),
 
     /** Nodes running the shared proxy layer */
-    proxy("Proxy node"),
+    proxy(null, "Proxy node"),
 
     /** A host of a (Docker) proxy node */
-    proxyhost("Proxy docker host", proxy),
+    proxyhost(proxy, "Proxy docker host"),
 
     /** A config server */
-    config("Config server"),
+    config(null, "Config server"),
 
     /** A host of a (Docker) config server node */
-    confighost("Config docker host", config),
+    confighost(config, "Config docker host"),
 
     /** A controller */
-    controller("Controller"),
+    controller(null, "Controller"),
 
     /** A host of a (Docker) controller node */
-    controllerhost("Controller host", controller),
-
-    /** A host of multiple nodes, only used in {@link SystemName#dev} */
-    devhost("Dev host", tenant, config, controller);
+    controllerhost(controller, "Controller host");
 
-    private final List<NodeType> childNodeTypes;
+    private final NodeType childNodeType;
     private final String description;
 
-    NodeType(String description, NodeType... childNodeTypes) {
-        this.childNodeTypes = List.copyOf(Set.of(childNodeTypes));
+    NodeType(NodeType childNodeType, String description) {
+        this.childNodeType = childNodeType;
         this.description = description;
     }
 
     public boolean isDockerHost() {
-        return !childNodeTypes.isEmpty();
+        return childNodeType != null;
     }
 
     public String description() {
@@ -59,17 +53,9 @@ public enum NodeType {
      * @throws IllegalStateException if this type is not a host
      */
     public NodeType childNodeType() {
-        return childNodeTypes().get(0);
-    }
-
-    /**
-     * @return all {@link NodeType}s that can run on this host
-     * @throws IllegalStateException if this type is not a host
-     */
-    public List<NodeType> childNodeTypes() {
         if (! isDockerHost())
             throw new IllegalStateException(this + " has no children");
-        return childNodeTypes;
-    }
 
+        return childNodeType;
+    }
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index a7c45cf1cbc..39473ed0b3a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -407,7 +407,6 @@ public class NodeSerializer {
             case "confighost": return NodeType.confighost;
             case "controller": return NodeType.controller;
             case "controllerhost": return NodeType.controllerhost;
-            case "devhost": return NodeType.devhost;
             default : throw new IllegalArgumentException("Unknown node type '" + typeString + "'");
         }
     }
@@ -422,7 +421,6 @@ public class NodeSerializer {
             case confighost: return "confighost";
             case controller: return "controller";
             case controllerhost: return "controllerhost";
-            case devhost: return "devhost";
         }
         throw new IllegalArgumentException("Serialized form of '" + type + "' not defined");
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeSerializer.java
index 832e0094121..75a8dbdcffc 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodeSerializer.java
@@ -49,7 +49,6 @@ public class NodeSerializer {
             case "confighost": return NodeType.confighost;
             case "controller": return NodeType.controller;
             case "controllerhost": return NodeType.controllerhost;
-            case "devhost": return NodeType.devhost;
             default: throw new IllegalArgumentException("Unknown node type '" + nodeType + "'");
         }
     }
@@ -64,7 +63,6 @@ public class NodeSerializer {
             case confighost: return "confighost";
             case controller: return "controller";
             case controllerhost: return "controllerhost";
-            case devhost: return "devhost";
             default: throw new IllegalArgumentException("Unknown node type '" + type.name() + "'");
         }
     }