Add preferToRetire to node response

36 files changed, 36 insertions, 1 deletions

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 1175736e517..502de3ef734 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
@@ -184,6 +184,7 @@ class NodesResponse extends HttpResponse {
         currentDockerImage(node).ifPresent(dockerImage -> object.setString("currentDockerImage", dockerImage.asString()));
         object.setLong("failCount", node.status().failCount());
         object.setBool("wantToRetire", node.status().wantToRetire());
+        object.setBool("preferToRetire", node.status().preferToRetire());
         object.setBool("wantToDeprovision", node.status().wantToDeprovision());
         toSlime(node.history(), object.setArray("history"));
         ipAddressesToSlime(node.ipConfig().primary(), object.setArray("ipAddresses"));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
index 3945c518a77..d727d473b84 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiTest.java
@@ -224,7 +224,7 @@ public class NodesV2ApiTest {
                        "{\"message\":\"Updated dockerhost2.yahoo.com\"}");
         // Make sure that wantToRetire is applied recursively, but wantToDeprovision isn't
         tester.assertResponseContains(new Request("http://localhost:8080/nodes/v2/node/host5.yahoo.com"),
-                "\"wantToRetire\":true,\"wantToDeprovision\":false,");
+                "\"wantToRetire\":true,\"preferToRetire\":false,\"wantToDeprovision\":false,");
 
         tester.assertResponseContains(new Request("http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com"), "\"modelName\":\"foo\"");
         assertResponse(new Request("http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com",
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 d2d39b06161..f615379d015 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
@@ -13,6 +13,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 969c9a1b9c2..4a4e82dfa25 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
@@ -13,6 +13,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 413c1af0c71..f73e4fdefb9 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
@@ -13,6 +13,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 c97509b3b3d..3558c7d6731 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
@@ -31,6 +31,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 77622933866..834baf3d902 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
@@ -33,6 +33,7 @@
   "wantedOsVersion": "7.5.2",
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 220fdbd8654..19d5b3f1e06 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
@@ -45,6 +45,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": true,
+  "preferToRetire": false,
   "wantToDeprovision": true,
   "history": [
     {
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 d2474f21c55..344eaa925da 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
@@ -45,6 +45,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 cbf02795d73..f1e26fa00b5 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
@@ -45,6 +45,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 c00c06634b5..db435f30adc 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
@@ -45,6 +45,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": true,
+  "preferToRetire": false,
   "wantToDeprovision": true,
   "history": [
     {
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 b6b93c8d108..0ce84ef451d 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
@@ -31,6 +31,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 88e4d132ed5..c5b5941a68e 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
@@ -31,6 +31,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 c890f1e72be..27a57424f18 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
@@ -31,6 +31,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 197a8c248e9..1fae632d59d 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
@@ -31,6 +31,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 2638b6b74f5..e68a81b57f6 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
@@ -31,6 +31,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 ea5c3623303..1fbbbdf1847 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
@@ -33,6 +33,7 @@
   "wantedFirmwareCheck": 123,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 8d437b3e47c..064f9650956 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
@@ -20,6 +20,7 @@
   "currentRebootGeneration": 0,
   "failCount": 1,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 ffa7b8d448a..2e315c26a8e 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
@@ -30,6 +30,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 ee857e0afba..f3319fda5dc 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
@@ -33,6 +33,7 @@
   "currentDockerImage": "docker-registry.domain.tld:8080/dist/vespa:5.104.142",
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 baf0325b284..9109e2f674f 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
@@ -13,6 +13,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 2e96c4c9bbc..4cee6be33dd 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
@@ -30,6 +30,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 bfbecc09c60..80ffb455012 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
@@ -30,6 +30,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 b8ce5c86c4d..742cf1b523d 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
@@ -30,6 +30,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 70ae2a030bd..d82984fb55a 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
@@ -12,6 +12,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 98b64e9eb25..77e1fb1e16d 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
@@ -36,6 +36,7 @@
   "currentDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.45.0",
   "failCount": 1,
   "wantToRetire": true,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 40b5f29c13f..b8da85fd9a8 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
@@ -33,6 +33,7 @@
   "currentDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.41.0",
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 c8680e1b420..8a8c89c246c 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
@@ -33,6 +33,7 @@
   "currentDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.41.0",
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 beb42ec6907..1b4cfed02d6 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
@@ -13,6 +13,7 @@
   "currentRebootGeneration": 0,
   "failCount": 1,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 3fb5ffa4708..de1be46b9b1 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
@@ -15,6 +15,7 @@
   "currentDockerImage": "docker-registry.domain.tld:8080/dist/vespa:1.2.3",
   "failCount": 1,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 0a2bf95c5bd..a4d6500ea07 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
@@ -12,6 +12,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": true,
+  "preferToRetire": false,
   "wantToDeprovision": true,
   "history": [
     {
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 5a665a5a223..15d52b49076 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
@@ -30,6 +30,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 38757b81156..2c997bc829a 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
@@ -12,6 +12,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 8951d1905ab..4b7d8c162bd 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
@@ -13,6 +13,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 809e58bd7b6..24ea61232ec 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
@@ -13,6 +13,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {
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 f8fd04d0624..6c7060b3555 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
@@ -15,6 +15,7 @@
   "currentRebootGeneration": 0,
   "failCount": 0,
   "wantToRetire": false,
+  "preferToRetire": false,
   "wantToDeprovision": false,
   "history": [
     {