The node repo owns state transitions

21 files changed, 74 insertions, 70 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index 14658e57c1b..f4b79129ada 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -77,10 +77,8 @@ public final class ClusterSpec {
      */
     public boolean isExclusive() { return exclusive; }
 
-    /** Whether this cluster has state */
-    public boolean isStateful() {
-        return stateful;
-    }
+    /** Returns whether this cluster has state */
+    public boolean isStateful() { return stateful; }
 
     public ClusterSpec with(Optional<Group> newGroup) {
         return new ClusterSpec(type, id, newGroup, vespaVersion, exclusive, combinedId, dockerImageRepo, stateful);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java
index b0b61e8a6b2..19c1fa090c9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java
@@ -69,6 +69,16 @@ public class NodeList extends AbstractFilteringList<Node, NodeList> {
         return matching(node -> node.allocation().isPresent() && node.allocation().get().membership().cluster().type().isContainer());
     }
 
+    /** Returns the subset of nodes that run a stateless service */
+    public NodeList stateless() {
+        return matching(node -> node.allocation().isPresent() && ! node.allocation().get().membership().cluster().isStateful());
+    }
+
+    /** Returns the subset of nodes that run a stateful service */
+    public NodeList stateful() {
+        return matching(node -> node.allocation().isPresent() && node.allocation().get().membership().cluster().isStateful());
+    }
+
     /** Returns the subset of nodes that are currently changing their Vespa version */
     public NodeList changingVersion() {
         return matching(node -> node.status().vespaVersion().isPresent() &&
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
index 4eb38fa650e..5222269ef42 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
@@ -29,6 +29,7 @@ import com.yahoo.vespa.hosted.provision.maintenance.NodeFailer;
 import com.yahoo.vespa.hosted.provision.maintenance.PeriodicApplicationMaintainer;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.node.Allocation;
+import com.yahoo.vespa.hosted.provision.node.History;
 import com.yahoo.vespa.hosted.provision.node.IP;
 import com.yahoo.vespa.hosted.provision.node.NodeAcl;
 import com.yahoo.vespa.hosted.provision.node.filter.NodeFilter;
@@ -410,7 +411,7 @@ public class NodeRepository extends AbstractComponent {
         for (Node node : nodes) {
             if ( ! node.flavor().getType().equals(Flavor.Type.DOCKER_CONTAINER))
                 illegal("Cannot add " + node + ": This is not a docker node");
-            if ( ! node.allocation().isPresent())
+            if (node.allocation().isEmpty())
                 illegal("Cannot add " + node + ": Docker containers needs to be allocated");
             Optional<Node> existing = getNode(node.hostname());
             if (existing.isPresent())
@@ -531,22 +532,11 @@ public class NodeRepository extends AbstractComponent {
     }
 
     /** Move nodes to the dirty state */
-    public List<Node> setDirty(List<Node> nodes, Agent agent, String reason) {
-        return performOn(NodeListFilter.from(nodes), (node, lock) -> setDirty(node, agent, reason));
+    public List<Node> deallocate(List<Node> nodes, Agent agent, String reason) {
+        return performOn(NodeListFilter.from(nodes), (node, lock) -> deallocate(node, agent, reason));
     }
 
-    /**
-     * Set a node dirty, allowed if it is in the provisioned, inactive, failed or parked state.
-     * Use this to clean newly provisioned nodes or to recycle failed nodes which have been repaired or put on hold.
-     *
-     * @throws IllegalArgumentException if the node has hardware failure
-     */
-    public Node setDirty(Node node, Agent agent, String reason) {
-        return db.writeTo(State.dirty, node, agent, Optional.of(reason));
-    }
-
-
-    public List<Node> dirtyRecursively(String hostname, Agent agent, String reason) {
+    public List<Node> deallocateRecursively(String hostname, Agent agent, String reason) {
         Node nodeToDirty = getNode(hostname).orElseThrow(() ->
                 new IllegalArgumentException("Could not deallocate " + hostname + ": Node not found"));
 
@@ -568,7 +558,28 @@ public class NodeRepository extends AbstractComponent {
             illegal("Could not deallocate " + nodeToDirty + ": " +
                     hostnamesNotAllowedToDirty + " are not in states [provisioned, failed, parked, breakfixed]");
 
-        return nodesToDirty.stream().map(node -> setDirty(node, agent, reason)).collect(Collectors.toList());
+        return nodesToDirty.stream().map(node -> deallocate(node, agent, reason)).collect(Collectors.toList());
+    }
+
+    /**
+     * Set a node dirty  or parked, allowed if it is in the provisioned, inactive, failed or parked state.
+     * Use this to clean newly provisioned nodes or to recycle failed nodes which have been repaired or put on hold.
+     *
+     * @throws IllegalArgumentException if the node has hardware failure
+     */
+    public Node deallocate(Node node, Agent agent, String reason) {
+        if (node.state() != State.parked && agent != Agent.operator
+            && (node.status().wantToDeprovision() || retiredByOperator(node)))
+            return park(node.hostname(), false, agent, reason);
+        else
+            return db.writeTo(State.dirty, node, agent, Optional.of(reason));
+    }
+
+    private static boolean retiredByOperator(Node node) {
+        return node.status().wantToRetire() && node.history().event(History.Event.Type.wantToRetire)
+                                                   .map(History.Event::agent)
+                                                   .map(agent -> agent == Agent.operator)
+                                                   .orElse(false);
     }
 
     /**
@@ -981,4 +992,5 @@ public class NodeRepository extends AbstractComponent {
     private void illegal(String message) {
         throw new IllegalArgumentException(message);
     }
+
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
index b55f49722cb..1a47af6b929 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
@@ -112,7 +112,7 @@ public class FailedExpirer extends NodeRepositoryMaintainer {
                 nodesToRecycle.add(candidate);
             }
         }
-        nodeRepository.setDirty(nodesToRecycle, Agent.FailedExpirer, "Expired by FailedExpirer");
+        nodeRepository.deallocate(nodesToRecycle, Agent.FailedExpirer, "Expired by FailedExpirer");
     }
 
     /** Returns whether the current node fail count should be used as an indicator of hardware issue */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java
index 392146f6ead..231d2ac08b1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java
@@ -14,14 +14,9 @@ import java.util.List;
 /**
  * Maintenance job which moves inactive nodes to dirty or parked after timeout.
  *
- * The timeout is in place for two reasons:
- *
- * - To ensure that the new application configuration has time to
- *   propagate before the node is used for something else.
- *
- * - To provide a grace period in which nodes can be brought back to active
- *   if they were deactivated in error. As inactive nodes retain their state
- *   they can be brought back to active and correct state faster than a new node.
+ * The timeout is in place to provide a grace period in which nodes can be brought back to active
+ * if they were deactivated in error. As inactive nodes retain their state
+ * they can be brought back to active and correct state faster than a new node.
  *
  * Nodes with following flags set are not reusable and will be moved to parked
  * instead of dirty:
@@ -44,11 +39,7 @@ public class InactiveExpirer extends Expirer {
     @Override
     protected void expire(List<Node> expired) {
         expired.forEach(node -> {
-            if (node.status().wantToDeprovision() || retiredByOperator(node)) {
-                nodeRepository.park(node.hostname(), false, Agent.InactiveExpirer, "Expired by InactiveExpirer");
-            } else {
-                nodeRepository.setDirty(node, Agent.InactiveExpirer, "Expired by InactiveExpirer");
-            }
+            nodeRepository.deallocate(node, Agent.InactiveExpirer, "Expired by InactiveExpirer");
         });
     }
 
@@ -58,11 +49,4 @@ public class InactiveExpirer extends Expirer {
                || node.allocation().get().owner().instance().isTester();
     }
 
-    private static boolean retiredByOperator(Node node) {
-        return node.status().wantToRetire() && node.history().event(History.Event.Type.wantToRetire)
-                                                   .map(History.Event::agent)
-                                                   .map(agent -> agent == Agent.operator)
-                                                   .orElse(false);
-    }
-
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
index 66ddf7f9ffe..52c487c28cf 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
@@ -186,7 +186,7 @@ class MaintenanceDeployment implements Closeable {
 
                     // Immediately clean up if we reserved the node but could not activate or reserved a node on the wrong host
                     expectedNewNode.flatMap(node -> nodeRepository.getNode(node.hostname(), Node.State.reserved))
-                                   .ifPresent(node -> nodeRepository.setDirty(node, agent, "Expired by " + agent));
+                                   .ifPresent(node -> nodeRepository.deallocate(node, agent, "Expired by " + agent));
                 }
             }
         }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirer.java
index c6427123d09..1967615de02 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirer.java
@@ -25,6 +25,6 @@ public class ReservationExpirer extends Expirer {
     }
 
     @Override
-    protected void expire(List<Node> expired) { nodeRepository().setDirty(expired, Agent.ReservationExpirer, "Expired by ReservationExpirer"); }
+    protected void expire(List<Node> expired) { nodeRepository().deallocate(expired, Agent.ReservationExpirer, "Expired by ReservationExpirer"); }
 
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
index 9b5dac49e32..08bfd104863 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
@@ -142,7 +142,7 @@ public class NodesV2ApiHandler extends LoggingRequestHandler {
             return new MessageResponse("Moved " + hostnamesAsString(parkedNodes) + " to parked");
         }
         else if (path.startsWith("/nodes/v2/state/dirty/")) {
-            List<Node> dirtiedNodes = nodeRepository.dirtyRecursively(lastElement(path), Agent.operator, "Dirtied through the nodes/v2 API");
+            List<Node> dirtiedNodes = nodeRepository.deallocateRecursively(lastElement(path), Agent.operator, "Dirtied through the nodes/v2 API");
             return new MessageResponse("Moved " + hostnamesAsString(dirtiedNodes) + " to dirty");
         }
         else if (path.startsWith("/nodes/v2/state/active/")) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
index 1f8f3d32043..cf1ccf9a052 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
@@ -142,11 +142,11 @@ public class MockNodeRepository extends NodeRepository {
         nodes = addNodes(nodes, Agent.system);
         nodes.remove(node7);
         nodes.remove(node55);
-        nodes = setDirty(nodes, Agent.system, getClass().getSimpleName());
+        nodes = deallocate(nodes, Agent.system, getClass().getSimpleName());
         setReady(nodes, Agent.system, getClass().getSimpleName());
 
         fail(node5.hostname(), Agent.system, getClass().getSimpleName());
-        dirtyRecursively(node55.hostname(), Agent.system, getClass().getSimpleName());
+        deallocateRecursively(node55.hostname(), Agent.system, getClass().getSimpleName());
 
         fail("dockerhost6.yahoo.com", Agent.operator, getClass().getSimpleName());
         removeRecursively("dockerhost6.yahoo.com");
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
index bcf53a07490..5f357b9e4b0 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
@@ -228,12 +228,12 @@ public class NodeRepositoryTest {
         assertEquals(6, tester.nodeRepository().getNodes().size());
 
         // Should be OK to dirty host2 as it is in provisioned and its only child is in failed
-        tester.nodeRepository().dirtyRecursively("host2", Agent.system, NodeRepositoryTest.class.getSimpleName());
+        tester.nodeRepository().deallocateRecursively("host2", Agent.system, NodeRepositoryTest.class.getSimpleName());
         assertEquals(asSet("host2", "node20"), filterNodes(tester, node -> node.state() == Node.State.dirty));
 
         // Cant dirty host1, node11 is ready and node12 is active
         try {
-            tester.nodeRepository().dirtyRecursively("host1", Agent.system, NodeRepositoryTest.class.getSimpleName());
+            tester.nodeRepository().deallocateRecursively("host1", Agent.system, NodeRepositoryTest.class.getSimpleName());
             fail("Should not be able to dirty host1");
         } catch (IllegalArgumentException ignored) { } // Expected;
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
index 940404fa605..9f2f7541c91 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
@@ -312,7 +312,7 @@ public class FailedExpirerTest {
             List<Node> nodes = Stream.of(hostname)
                                      .map(this::get)
                                      .collect(Collectors.toList());
-            nodes = nodeRepository.setDirty(nodes, Agent.system, getClass().getSimpleName());
+            nodes = nodeRepository.deallocate(nodes, Agent.system, getClass().getSimpleName());
             nodeRepository.setReady(nodes, Agent.system, getClass().getSimpleName());
             return this;
         }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java
index 8bcf1552204..368f5da0e5b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirerTest.java
@@ -138,11 +138,11 @@ public class LoadBalancerExpirerTest {
     }
 
     private void dirtyNodesOf(ApplicationId application, ClusterSpec.Id cluster) {
-        tester.nodeRepository().setDirty(tester.nodeRepository().getNodes(application).stream()
-                                               .filter(node -> node.allocation().isPresent())
-                                               .filter(node -> node.allocation().get().membership().cluster().id().equals(cluster))
-                                               .collect(Collectors.toList()),
-                                         Agent.system, this.getClass().getSimpleName());
+        tester.nodeRepository().deallocate(tester.nodeRepository().getNodes(application).stream()
+                                                 .filter(node -> node.allocation().isPresent())
+                                                 .filter(node -> node.allocation().get().membership().cluster().id().equals(cluster))
+                                                 .collect(Collectors.toList()),
+                                           Agent.system, this.getClass().getSimpleName());
     }
 
     private void deployApplication(ApplicationId application, ClusterSpec.Id... clusters) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
index c03e489def2..416ba7c6c14 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
@@ -163,7 +163,7 @@ public class MetricsReporterTest {
         Node dockerHost = Node.create("openStackId1", new IP.Config(Set.of("::1"), ipAddressPool), "dockerHost",
                                       nodeFlavors.getFlavorOrThrow("host"), NodeType.host).build();
         nodeRepository.addNodes(List.of(dockerHost), Agent.system);
-        nodeRepository.dirtyRecursively("dockerHost", Agent.system, getClass().getSimpleName());
+        nodeRepository.deallocateRecursively("dockerHost", Agent.system, getClass().getSimpleName());
         nodeRepository.setReady("dockerHost", Agent.system, getClass().getSimpleName());
 
         Node container1 = Node.createDockerNode(Set.of("::2"), "container1",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java
index 12b682ae26c..d0473d08ea2 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java
@@ -259,7 +259,7 @@ public class NodeFailTester {
         }
 
         nodes = nodeRepository.addNodes(nodes, Agent.system);
-        nodes = nodeRepository.setDirty(nodes, Agent.system, getClass().getSimpleName());
+        nodes = nodeRepository.deallocate(nodes, Agent.system, getClass().getSimpleName());
         return nodeRepository.setReady(nodes, Agent.system, getClass().getSimpleName());
     }
 
@@ -267,7 +267,7 @@ public class NodeFailTester {
         List<Node> nodes = tester.makeProvisionedNodes(count, (index) -> "parent" + index,
                                                        hostFlavors.getFlavorOrThrow("default"),
                                                        Optional.empty(), NodeType.host, 10, false);
-        nodes = nodeRepository.setDirty(nodes, Agent.system, getClass().getSimpleName());
+        nodes = nodeRepository.deallocate(nodes, Agent.system, getClass().getSimpleName());
         tester.activateTenantHosts();
         return nodeRepository.setReady(nodes, Agent.system, getClass().getSimpleName());
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
index 7a636a030ec..35c325f6cb2 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java
@@ -263,7 +263,7 @@ public class LoadBalancerProvisionerTest {
     }
 
     private void dirtyNodesOf(ApplicationId application) {
-        tester.nodeRepository().setDirty(tester.nodeRepository().getNodes(application), Agent.system, this.getClass().getSimpleName());
+        tester.nodeRepository().deallocate(tester.nodeRepository().getNodes(application), Agent.system, this.getClass().getSimpleName());
     }
 
     private Set<HostSpec> prepare(ApplicationId application, ClusterSpec... specs) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
index ebd856e96a0..7c43a8d5859 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
@@ -456,7 +456,7 @@ public class ProvisioningTester {
         }
 
         nodes = nodeRepository.addNodes(nodes, Agent.system);
-        nodes = nodeRepository.setDirty(nodes, Agent.system, getClass().getSimpleName());
+        nodes = nodeRepository.deallocate(nodes, Agent.system, getClass().getSimpleName());
         nodeRepository.setReady(nodes, Agent.system, getClass().getSimpleName());
 
         ConfigServerApplication application = new ConfigServerApplication();
@@ -482,7 +482,7 @@ public class ProvisioningTester {
     }
     public List<Node> makeReadyNodes(int n, Flavor flavor, Optional<TenantName> reservedTo, NodeType type, int ipAddressPoolSize, boolean dualStack) {
         List<Node> nodes = makeProvisionedNodes(n, flavor, reservedTo, type, ipAddressPoolSize, dualStack);
-        nodes = nodeRepository.setDirty(nodes, Agent.system, getClass().getSimpleName());
+        nodes = nodeRepository.deallocate(nodes, Agent.system, getClass().getSimpleName());
         return nodeRepository.setReady(nodes, Agent.system, getClass().getSimpleName());
     }
 
@@ -523,7 +523,7 @@ public class ProvisioningTester {
             nodes.add(builder.build());
         }
         nodes = nodeRepository.addNodes(nodes, Agent.system);
-        nodes = nodeRepository.setDirty(nodes, Agent.system, getClass().getSimpleName());
+        nodes = nodeRepository.deallocate(nodes, Agent.system, getClass().getSimpleName());
         nodeRepository.setReady(nodes, Agent.system, getClass().getSimpleName());
         return nodes;
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json
index 3107311b792..0a2bf95c5bd 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json
@@ -1,14 +1,14 @@
 {
   "url": "http://localhost:8080/nodes/v2/node/host55.yahoo.com",
   "id": "host55.yahoo.com",
-  "state": "dirty",
+  "state": "parked",
   "type": "tenant",
   "hostname": "host55.yahoo.com",
   "openStackId": "node55",
   "flavor": "[vcpu: 2.0, memory: 8.0 Gb, disk 50.0 Gb, bandwidth: 1.0 Gbps, storage type: local]",
   "resources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local"},
   "environment": "DOCKER_CONTAINER",
-  "rebootGeneration": 1,
+  "rebootGeneration": 0,
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": true,
@@ -20,7 +20,7 @@
       "agent": "system"
     },
     {
-      "event": "deallocated",
+      "event": "parked",
       "at": 123,
       "agent": "system"
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive-include-deprovisioned.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive-include-deprovisioned.json
index 2b650bad39b..03df6c8e1dc 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive-include-deprovisioned.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive-include-deprovisioned.json
@@ -17,8 +17,8 @@
     @include(node2.json),
     @include(docker-node1.json),
     @include(node1.json),
-    @include(node55.json),
     @include(node5.json),
+    @include(node55.json),
     @include(dockerhost6.json)
   ]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive.json
index 55e216f454a..8835945dc92 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes-recursive.json
@@ -17,7 +17,7 @@
     @include(node2.json),
     @include(docker-node1.json),
     @include(node1.json),
-    @include(node55.json),
-    @include(node5.json)
+    @include(node5.json),
+    @include(node55.json)
   ]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes.json
index 54ff2bc232f..db4d0bb1682 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/nodes.json
@@ -52,10 +52,10 @@
       "url": "http://localhost:8080/nodes/v2/node/host1.yahoo.com"
     },
     {
-      "url": "http://localhost:8080/nodes/v2/node/host55.yahoo.com"
+      "url": "http://localhost:8080/nodes/v2/node/host5.yahoo.com"
     },
     {
-      "url": "http://localhost:8080/nodes/v2/node/host5.yahoo.com"
+      "url": "http://localhost:8080/nodes/v2/node/host55.yahoo.com"
     }
   ]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/states-recursive.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/states-recursive.json
index 27767be6315..68ff9fedc00 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/states-recursive.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/states-recursive.json
@@ -45,7 +45,6 @@
     "dirty": {
       "url": "http://localhost:8080/nodes/v2/state/dirty",
       "nodes": [
-        @include(node55.json)
       ]
     },
     "failed": {
@@ -57,6 +56,7 @@
     "parked": {
       "url": "http://localhost:8080/nodes/v2/state/parked",
       "nodes": [
+        @include(node55.json)
       ]
     },
     "deprovisioned": {