Merge pull request #17337 from vespa-engine/mpolden/add-field

Add wantToRebuild field to node response

39 files changed, 79 insertions, 8 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 8c1fc57f4b6..d1078b5e30c 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
@@ -56,6 +56,7 @@ public class Node {
     private final boolean retired;
     private final boolean wantToRetire;
     private final boolean wantToDeprovision;
+    private final boolean wantToRebuild;
     private final Optional<TenantName> reservedTo;
     private final Optional<ApplicationId> exclusiveTo;
     private final Map<String, JsonNode> reports;
@@ -69,7 +70,7 @@ public class Node {
                 Optional<Instant> currentFirmwareCheck, Optional<Instant> wantedFirmwareCheck, ServiceState serviceState,
                 Optional<Instant> suspendedSince, long restartGeneration, long wantedRestartGeneration, long rebootGeneration, long wantedRebootGeneration,
                 int cost, String flavor, String clusterId, ClusterType clusterType, boolean retired, boolean wantToRetire, boolean wantToDeprovision,
-                Optional<TenantName> reservedTo, Optional<ApplicationId> exclusiveTo,
+                boolean wantToRebuild, Optional<TenantName> reservedTo, Optional<ApplicationId> exclusiveTo,
                 DockerImage wantedDockerImage, DockerImage currentDockerImage, Map<String, JsonNode> reports, List<NodeHistory> history,
                 Set<String> additionalIpAddresses, String openStackId, Optional<String> switchHostname) {
         this.hostname = hostname;
@@ -101,6 +102,7 @@ public class Node {
         this.exclusiveTo = exclusiveTo;
         this.wantedDockerImage = wantedDockerImage;
         this.currentDockerImage = currentDockerImage;
+        this.wantToRebuild = wantToRebuild;
         this.reports = reports;
         this.history = history;
         this.openStackId = openStackId;
@@ -214,6 +216,10 @@ public class Node {
         return wantToDeprovision;
     }
 
+    public boolean wantToRebuild() {
+        return wantToRebuild;
+    }
+
     public Optional<TenantName> reservedTo() { return reservedTo; }
 
     public Optional<ApplicationId> exclusiveTo() { return exclusiveTo; }
@@ -262,6 +268,7 @@ public class Node {
         failed,
         parked,
         breakfixed,
+        deprovisioned,
         unknown
     }
 
@@ -311,6 +318,7 @@ public class Node {
         private boolean retired;
         private boolean wantToRetire;
         private boolean wantToDeprovision;
+        private boolean wantToRebuild;
         private Optional<TenantName> reservedTo = Optional.empty();
         private Optional<ApplicationId> exclusiveTo = Optional.empty();
         private Map<String, JsonNode> reports = new HashMap<>();
@@ -349,6 +357,7 @@ public class Node {
             this.retired = node.retired;
             this.wantToRetire = node.wantToRetire;
             this.wantToDeprovision = node.wantToDeprovision;
+            this.wantToRebuild = node.wantToRebuild;
             this.reservedTo = node.reservedTo;
             this.exclusiveTo = node.exclusiveTo;
             this.reports = node.reports;
@@ -493,6 +502,11 @@ public class Node {
             return this;
         }
 
+        public Builder wantToRebuild(boolean wantToRebuild) {
+            this.wantToRebuild = wantToRebuild;
+            return this;
+        }
+
         public Builder reservedTo(TenantName tenant) {
             this.reservedTo = Optional.of(tenant);
             return this;
@@ -527,7 +541,7 @@ public class Node {
             return new Node(hostname, parentHostname, state, type, resources, owner, currentVersion, wantedVersion,
                             currentOsVersion, wantedOsVersion, currentFirmwareCheck, wantedFirmwareCheck, serviceState,
                             suspendedSince, restartGeneration, wantedRestartGeneration, rebootGeneration, wantedRebootGeneration,
-                            cost, flavor, clusterId, clusterType, retired, wantToRetire, wantToDeprovision, reservedTo, exclusiveTo,
+                            cost, flavor, clusterId, clusterType, retired, wantToRetire, wantToDeprovision, wantToRebuild, reservedTo, exclusiveTo,
                             wantedDockerImage, currentDockerImage, reports, history, additionalIpAddresses, openStackId, switchHostname);
         }
 
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 7d454b2134f..72592e16bfd 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
@@ -148,7 +148,7 @@ public interface NodeRepository {
                         Optional.ofNullable(node.getMembership()).map(NodeMembership::getRetired).orElse(false),
                         node.getWantToRetire(),
                         node.getWantToDeprovision(),
-                        Optional.ofNullable(node.getReservedTo()).map(TenantName::from),
+                        node.getWantToRebuild(), Optional.ofNullable(node.getReservedTo()).map(TenantName::from),
                         Optional.ofNullable(node.getExclusiveTo()).map(ApplicationId::fromSerializedForm),
                         dockerImageFrom(node.getWantedDockerImage()),
                         dockerImageFrom(node.getCurrentDockerImage()),
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
index 8b027cb229a..80d710eda2b 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
@@ -12,6 +12,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+/**
+ * The wire format of a node retrieved from the node repository.
+ *
+ * @author bjorncs
+ */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class NodeRepositoryNode {
@@ -78,6 +83,8 @@ public class NodeRepositoryNode {
     private Boolean wantToRetire;
     @JsonProperty("wantToDeprovision")
     private Boolean wantToDeprovision;
+    @JsonProperty("wantToRebuild")
+    private Boolean wantToRebuild;
     @JsonProperty("cost")
     private Integer cost;
     @JsonProperty("history")
@@ -303,6 +310,10 @@ public class NodeRepositoryNode {
 
     public Boolean getWantToDeprovision() { return wantToDeprovision; }
 
+    public Boolean getWantToRebuild() {
+        return wantToRebuild;
+    }
+
     public void setWantToRetire(Boolean wantToRetire) {
         this.wantToRetire = wantToRetire;
     }
@@ -311,6 +322,10 @@ public class NodeRepositoryNode {
         this.wantToDeprovision = wantToDeprovision;
     }
 
+    public void setWantToRebuild(Boolean wantToRebuild) {
+        this.wantToRebuild = wantToRebuild;
+    }
+
     public Integer getCost() {
         return cost;
     }
@@ -442,6 +457,8 @@ public class NodeRepositoryNode {
                ", wantedVespaVersion='" + wantedVespaVersion + '\'' +
                ", currentOsVersion='" + currentOsVersion + '\'' +
                ", wantedOsVersion='" + wantedOsVersion + '\'' +
+               ", currentFirmwareCheck=" + currentFirmwareCheck +
+               ", wantedFirmwareCheck=" + wantedFirmwareCheck +
                ", failCount=" + failCount +
                ", environment=" + environment +
                ", type=" + type +
@@ -450,14 +467,16 @@ public class NodeRepositoryNode {
                ", parentHostname='" + parentHostname + '\'' +
                ", wantToRetire=" + wantToRetire +
                ", wantToDeprovision=" + wantToDeprovision +
+               ", wantToRebuild=" + wantToRebuild +
                ", cost=" + cost +
                ", history=" + history +
-               ", orchestratorStatus=" + orchestratorStatus +
+               ", orchestratorStatus='" + orchestratorStatus + '\'' +
+               ", suspendedSinceMillis=" + suspendedSinceMillis +
                ", reports=" + reports +
-               ", modelName=" + modelName +
-               ", reservedTo=" + reservedTo +
-               ", exclusiveTo=" + exclusiveTo +
-               ", switchHostname=" + switchHostname +
+               ", modelName='" + modelName + '\'' +
+               ", reservedTo='" + reservedTo + '\'' +
+               ", exclusiveTo='" + exclusiveTo + '\'' +
+               ", switchHostname='" + switchHostname + '\'' +
                '}';
     }
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeState.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeState.java
index 3e5de9501f3..f4199736919 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeState.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeState.java
@@ -1,6 +1,9 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.noderepository;
 
+/**
+ * @author bjorncs
+ */
 public enum NodeState {
 
     provisioned,
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
index 1b521118106..1528a455046 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
@@ -169,6 +169,7 @@ class NodesResponse extends SlimeJsonResponse {
         object.setBool("wantToRetire", node.status().wantToRetire());
         object.setBool("preferToRetire", node.status().preferToRetire());
         object.setBool("wantToDeprovision", node.status().wantToDeprovision());
+        object.setBool("wantToRebuild", node.status().wantToRebuild());
         toSlime(node.history(), object.setArray("history"));
         ipAddressesToSlime(node.ipConfig().primary(), object.setArray("ipAddresses"));
         ipAddressesToSlime(node.ipConfig().pool().ipSet(), object.setArray("additionalIpAddresses"));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json
index f615379d015..61c381ae67e 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json
@@ -15,6 +15,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json
index 4a4e82dfa25..1b9504baa64 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json
@@ -15,6 +15,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json
index f73e4fdefb9..a4a71e0f48b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json
@@ -15,6 +15,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json
index 3558c7d6731..4f8dd0ade37 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json
@@ -33,6 +33,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "reserved",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json
index 834baf3d902..cf395653a42 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json
@@ -35,6 +35,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-2.json
index 19d5b3f1e06..98f9c9b245e 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-2.json
@@ -47,6 +47,7 @@
   "wantToRetire": true,
   "preferToRetire": false,
   "wantToDeprovision": true,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-3.json
index 344eaa925da..fe56b7ae711 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-3.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-3.json
@@ -47,6 +47,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-4.json
index f1e26fa00b5..ca1944b661d 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-4.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-4.json
@@ -47,6 +47,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports.json
index db435f30adc..dda664f52c6 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports.json
@@ -47,6 +47,7 @@
   "wantToRetire": true,
   "preferToRetire": false,
   "wantToDeprovision": true,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1.json
index 0ce84ef451d..5a897527077 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1.json
@@ -33,6 +33,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json
index c5b5941a68e..35b778b08d0 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json
@@ -33,6 +33,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node3.json
index 27a57424f18..0ff0747cc43 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node3.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node3.json
@@ -33,6 +33,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node4.json
index 1fae632d59d..6e085066c9f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node4.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node4.json
@@ -33,6 +33,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node5.json
index e68a81b57f6..b15e748084e 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node5.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node5.json
@@ -33,6 +33,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost1-with-firmware-data.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost1-with-firmware-data.json
index 1fbbbdf1847..2f58fadd187 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost1-with-firmware-data.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost1-with-firmware-data.json
@@ -35,6 +35,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost6.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost6.json
index 064f9650956..68da9b9427d 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost6.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost6.json
@@ -22,6 +22,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node1.json
index 2e315c26a8e..402b2a7873b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node1.json
@@ -32,6 +32,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node10.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node10.json
index f3319fda5dc..8c3801dc589 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node10.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node10.json
@@ -35,6 +35,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json
index 9109e2f674f..4e6ae69de38 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json
@@ -15,6 +15,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node13.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node13.json
index 4cee6be33dd..96ff3eab48d 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node13.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node13.json
@@ -32,6 +32,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "readied",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node14.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node14.json
index 80ffb455012..eb58f5fd928 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node14.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node14.json
@@ -32,6 +32,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "readied",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node2.json
index 742cf1b523d..134c7688b62 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node2.json
@@ -32,6 +32,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json
index d82984fb55a..81d2a30e73d 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json
@@ -14,6 +14,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json
index a2f43480605..15e76cae558 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json
@@ -38,6 +38,7 @@
   "wantToRetire": true,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-with-hostnames.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-with-hostnames.json
index b8da85fd9a8..869d9417a06 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-with-hostnames.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-with-hostnames.json
@@ -35,6 +35,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4.json
index 8a8c89c246c..7068796ab3f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4.json
@@ -35,6 +35,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5-after-changes.json
index 1b4cfed02d6..4ffd3c87d14 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5-after-changes.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5-after-changes.json
@@ -15,6 +15,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5.json
index de1be46b9b1..6197ff7b083 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5.json
@@ -17,6 +17,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
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 a4d6500ea07..9ccb0f1c1f4 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
@@ -14,6 +14,7 @@
   "wantToRetire": true,
   "preferToRetire": false,
   "wantToDeprovision": true,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node6.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node6.json
index 15d52b49076..b1f439c3745 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node6.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node6.json
@@ -32,6 +32,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node7.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node7.json
index 2c997bc829a..289e37f6aeb 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node7.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node7.json
@@ -14,6 +14,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json
index 4b7d8c162bd..e270b10a753 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json
@@ -15,6 +15,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json
index 24ea61232ec..7a69f51f2e4 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json
@@ -15,6 +15,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json
index 6c7060b3555..cf53435a860 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json
@@ -17,6 +17,7 @@
   "wantToRetire": false,
   "preferToRetire": false,
   "wantToDeprovision": false,
+  "wantToRebuild": false,
   "history": [
     {
       "event": "provisioned",