Revert "Revert "Add additionalIpAddresses field to Node""

22 files changed, 128 insertions, 37 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
index dda1859c6fa..9c0d504a9f4 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
@@ -30,6 +30,7 @@ public final class Node {
 
     private final String id;
     private final Set<String> ipAddresses;
+    private final Set<String> additionalIpAddresses;
     private final String hostname;
     private final String openStackId;
     private final Optional<String> parentHostname;
@@ -45,18 +46,18 @@ public final class Node {
     private Optional<Allocation> allocation;
 
     /** Creates a node in the initial state (provisioned) */
-    public static Node create(String openStackId, Set<String> ipAddresses, String hostname, Optional<String> parentHostname, Flavor flavor, NodeType type) {
-        return new Node(openStackId, ipAddresses, hostname, parentHostname, flavor, Status.initial(), State.provisioned,
+    public static Node create(String openStackId, Set<String> ipAddresses, Set<String> additionalIpAddresses, String hostname, Optional<String> parentHostname, Flavor flavor, NodeType type) {
+        return new Node(openStackId, ipAddresses, additionalIpAddresses, hostname, parentHostname, flavor, Status.initial(), State.provisioned,
                         Optional.empty(), History.empty(), type);
     }
 
     /** Do not use. Construct nodes by calling {@link NodeRepository#createNode} */
-    private Node(String openStackId, Set<String> ipAddresses, String hostname, Optional<String> parentHostname,
+    private Node(String openStackId, Set<String> ipAddresses, Set<String> additionalIpAddresses, String hostname, Optional<String> parentHostname,
                  Flavor flavor, Status status, State state, Allocation allocation, History history, NodeType type) {
-        this(openStackId, ipAddresses, hostname, parentHostname, flavor, status, state, Optional.of(allocation), history, type);
+        this(openStackId, ipAddresses, additionalIpAddresses, hostname, parentHostname, flavor, status, state, Optional.of(allocation), history, type);
     }
 
-    public Node(String openStackId, Set<String> ipAddresses, String hostname, Optional<String> parentHostname,
+    public Node(String openStackId, Set<String> ipAddresses, Set<String> additionalIpAddresses, String hostname, Optional<String> parentHostname,
                 Flavor flavor, Status status, State state, Optional<Allocation> allocation,
                 History history, NodeType type) {
         Objects.requireNonNull(openStackId, "A node must have an openstack id");
@@ -72,6 +73,7 @@ public final class Node {
 
         this.id = hostname;
         this.ipAddresses = ImmutableSet.copyOf(ipAddresses);
+        this.additionalIpAddresses = ImmutableSet.copyOf(additionalIpAddresses);
         this.hostname = hostname;
         this.parentHostname = parentHostname;
         this.openStackId = openStackId;
@@ -92,6 +94,9 @@ public final class Node {
     /** Returns the IP addresses of this node */
     public Set<String> ipAddresses() { return ipAddresses; }
 
+    /** Returns the additional IP addresses of this node (used to 'child' nodes) */
+    public Set<String> additionalIpAddresses() { return additionalIpAddresses; }
+
     /** Returns the host name of this node */
     public String hostname() { return hostname; }
 
@@ -154,22 +159,22 @@ public final class Node {
 
     /** Returns a node with the status assigned to the given value */
     public Node with(Status status) {
-        return new Node(openStackId, ipAddresses, hostname, parentHostname, flavor, status, state, allocation, history, type);
+        return new Node(openStackId, ipAddresses, additionalIpAddresses, hostname, parentHostname, flavor, status, state, allocation, history, type);
     }
 
     /** Returns a node with the type assigned to the given value */
     public Node with(NodeType type) {
-        return new Node(openStackId, ipAddresses, hostname, parentHostname, flavor, status, state, allocation, history, type);
+        return new Node(openStackId, ipAddresses, additionalIpAddresses, hostname, parentHostname, flavor, status, state, allocation, history, type);
     }
 
     /** Returns a node with the flavor assigned to the given value */
     public Node with(Flavor flavor) {
-        return new Node(openStackId, ipAddresses, hostname, parentHostname, flavor, status, state, allocation, history, type);
+        return new Node(openStackId, ipAddresses, additionalIpAddresses, hostname, parentHostname, flavor, status, state, allocation, history, type);
     }
 
     /** Returns a copy of this with the current reboot generation set to generation */
     public Node withReboot(Generation generation) {
-        return new Node(openStackId, ipAddresses, hostname, parentHostname, flavor, status.withReboot(generation), state,
+        return new Node(openStackId, ipAddresses, additionalIpAddresses, hostname, parentHostname, flavor, status.withReboot(generation), state,
                         allocation, history, type);
     }
 
@@ -194,18 +199,24 @@ public final class Node {
      * Do not use this to allocate a node.
      */
     public Node with(Allocation allocation) {
-        return new Node(openStackId, ipAddresses, hostname, parentHostname, flavor, status, state, allocation, history, type);
+        return new Node(openStackId, ipAddresses, additionalIpAddresses, hostname, parentHostname, flavor, status, state, allocation, history, type);
     }
 
     /** Returns a copy of this node with the IP addresses set to the given value. */
     public Node withIpAddresses(Set<String> ipAddresses) {
-        return new Node(openStackId, ipAddresses, hostname, parentHostname, flavor, status, state,
+        return new Node(openStackId, ipAddresses, additionalIpAddresses, hostname, parentHostname, flavor, status, state,
+                allocation, history, type);
+    }
+
+    /** Returns a copy of this node with the additional IP addresses set to the given value. */
+    public Node withAdditionalIpAddresses(Set<String> additionalIpAddresses) {
+        return new Node(openStackId, ipAddresses, additionalIpAddresses, hostname, parentHostname, flavor, status, state,
                 allocation, history, type);
     }
 
     /** Returns a copy of this node with the parent hostname assigned to the given value. */
     public Node withParentHostname(String parentHostname) {
-        return new Node(openStackId, ipAddresses, hostname, Optional.of(parentHostname), flavor, status, state,
+        return new Node(openStackId, ipAddresses, additionalIpAddresses, hostname, Optional.of(parentHostname), flavor, status, state,
                         allocation, history, type);
     }
 
@@ -220,7 +231,7 @@ public final class Node {
     
     /** Returns a copy of this node with the given history. */
     public Node with(History history) {
-        return new Node(openStackId, ipAddresses, hostname, parentHostname, flavor, status, state, allocation, history, type);
+        return new Node(openStackId, ipAddresses, additionalIpAddresses, hostname, parentHostname, flavor, status, state, allocation, history, type);
     }
 
     private void requireNonEmptyString(Optional<String> value, String message) {
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 4cbbbee0818..1f757177022 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
@@ -241,7 +241,7 @@ public class NodeRepository extends AbstractComponent {
         if (ipAddresses.isEmpty()) {
             ipAddresses = nameResolver.getAllByNameOrThrow(hostname);
         }
-        return Node.create(openStackId, ImmutableSet.copyOf(ipAddresses), hostname, parentHostname, flavor, type);
+        return Node.create(openStackId, ImmutableSet.copyOf(ipAddresses), Collections.emptySet(), hostname, parentHostname, flavor, type);
     }
 
     public Node createNode(String openStackId, String hostname, Optional<String> parentHostname,
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
index 8b71f648055..05ab7be499b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
@@ -159,7 +159,7 @@ public class CuratorDatabaseClient {
 
         CuratorTransaction curatorTransaction = curatorDatabase.newCuratorTransactionIn(transaction);
         for (Node node : nodes) {
-            Node newNode = new Node(node.openStackId(), node.ipAddresses(), node.hostname(),
+            Node newNode = new Node(node.openStackId(), node.ipAddresses(), node.additionalIpAddresses(), node.hostname(),
                                     node.parentHostname(), node.flavor(),
                                     newNodeStatus(node, toState),
                                     toState,
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 b6b6b24fa89..e3449bdbc17 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
@@ -48,6 +48,7 @@ public class NodeSerializer {
     // Node fields
     private static final String hostnameKey = "hostname";
     private static final String ipAddressesKey = "ipAddresses";
+    private static final String additionalIpAddressesKey = "additionalIpAddresses";
     private static final String openStackIdKey = "openStackId";
     private static final String parentHostnameKey = "parentHostname";
     private static final String historyKey = "history";
@@ -102,6 +103,7 @@ public class NodeSerializer {
     private void toSlime(Node node, Cursor object) {
         object.setString(hostnameKey, node.hostname());
         toSlime(node.ipAddresses(), object.setArray(ipAddressesKey));
+        toSlime(node.additionalIpAddresses(), object.setArray(additionalIpAddressesKey));
         object.setString(openStackIdKey, node.openStackId());
         node.parentHostname().ifPresent(hostname -> object.setString(parentHostnameKey, hostname));
         object.setString(flavorKey, node.flavor().name());
@@ -152,7 +154,8 @@ public class NodeSerializer {
 
     private Node nodeFromSlime(Node.State state, Inspector object) {
         return new Node(object.field(openStackIdKey).asString(),
-                        ipAddressesFromSlime(object),
+                        ipAddressesFromSlime(object, ipAddressesKey),
+                        ipAddressesFromSlime(object, additionalIpAddressesKey),
                         object.field(hostnameKey).asString(),
                         parentHostnameFromSlime(object),
                         flavorFromSlime(object),
@@ -239,12 +242,12 @@ public class NodeSerializer {
             return Optional.empty();
     }
 
-    private Set<String> ipAddressesFromSlime(Inspector object) {
+    private Set<String> ipAddressesFromSlime(Inspector object, String key) {
         ImmutableSet.Builder<String> ipAddresses = ImmutableSet.builder();
-        object.field(ipAddressesKey).traverse((ArrayTraverser) (i, item) -> ipAddresses.add(item.asString()));
+        object.field(key).traverse((ArrayTraverser) (i, item) -> ipAddresses.add(item.asString()));
         return ipAddresses.build();
     }
-    
+
     private Optional<Status.HardwareFailureType> hardwareFailureFromSlime(Inspector object) {
         if ( ! object.valid()) return Optional.empty();
         return Optional.of(hardwareFailureFromString(object.asString()));
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
index 0ac82f1dbd8..f88f7a663f0 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
@@ -173,6 +173,7 @@ class NodesResponse extends HttpResponse {
         object.setBool("wantToRetire", node.status().wantToRetire());
         toSlime(node.history(), object.setArray("history"));
         ipAddressesToSlime(node.ipAddresses(), object.setArray("ipAddresses"));
+        ipAddressesToSlime(node.additionalIpAddresses(), object.setArray("additionalIpAddresses"));
     }
 
     private String toString(NodeType type) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
index e8479ef9ec7..4fbd5bd1a66 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
@@ -24,9 +24,11 @@ import com.yahoo.vespa.hosted.provision.node.Status;
 import com.yahoo.vespa.hosted.provision.testutils.FlavorConfigBuilder;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -235,7 +237,7 @@ public class SerializationTest {
     @Test
     public void serialize_parentHostname() {
         final String parentHostname = "parent.yahoo.com";
-        Node node = Node.create("myId", singleton("127.0.0.1"), "myHostname", Optional.of(parentHostname), nodeFlavors.getFlavorOrThrow("default"), NodeType.tenant);
+        Node node = Node.create("myId", singleton("127.0.0.1"), Collections.emptySet(), "myHostname", Optional.of(parentHostname), nodeFlavors.getFlavorOrThrow("default"), NodeType.tenant);
 
         Node deserializedNode = nodeSerializer.fromJson(State.provisioned, nodeSerializer.toJson(node));
         assertEquals(parentHostname, deserializedNode.parentHostname().get());
@@ -249,6 +251,64 @@ public class SerializationTest {
     }
 
     @Test
+    public void serialize_additional_ip_addresses() throws IOException {
+        Node node = createNode();
+
+        // Test round-trip with additional addresses
+        node = node.withAdditionalIpAddresses(ImmutableSet.of("10.0.0.1", "10.0.0.2", "10.0.0.3"));
+        Node copy = nodeSerializer.fromJson(node.state(), nodeSerializer.toJson(node));
+        assertEquals(node.additionalIpAddresses(), copy.additionalIpAddresses());
+
+        // Test round-trip without additional addresses (handle empty ip set)
+        node = createNode();
+        copy = nodeSerializer.fromJson(node.state(), nodeSerializer.toJson(node));
+        assertEquals(node.additionalIpAddresses(), copy.additionalIpAddresses());
+
+        // TODO remove after MAI 2017
+        // Test deserialization of a json file without the additional ip addresses field
+        String json = "{\n" +
+                "  \"url\": \"http://localhost:8080/nodes/v2/node/host1.yahoo.com\",\n" +
+                "  \"id\": \"host1.yahoo.com\",\n" +
+                "  \"state\": \"active\",\n" +
+                "  \"type\": \"tenant\",\n" +
+                "  \"hostname\": \"host1.yahoo.com\",\n" +
+                "  \"openStackId\": \"node1\",\n" +
+                "  \"flavor\": \"default\",\n" +
+                "  \"canonicalFlavor\": \"default\",\n" +
+                "  \"minDiskAvailableGb\":400.0,\n" +
+                "  \"minMainMemoryAvailableGb\":16.0,\n" +
+                "  \"description\":\"Flavor-name-is-default\",\n" +
+                "  \"minCpuCores\":2.0,\n" +
+                "  \"environment\":\"BARE_METAL\",\n" +
+                "  \"owner\": {\n" +
+                "    \"tenant\": \"tenant2\",\n" +
+                "    \"application\": \"application2\",\n" +
+                "    \"instance\": \"instance2\"\n" +
+                "  },\n" +
+                "  \"membership\": {\n" +
+                "    \"clustertype\": \"content\",\n" +
+                "    \"clusterid\": \"id2\",\n" +
+                "    \"group\": \"0\",\n" +
+                "    \"index\": 0,\n" +
+                "    \"retired\": false\n" +
+                "  },\n" +
+                "  \"restartGeneration\": 0,\n" +
+                "  \"currentRestartGeneration\": 0,\n" +
+                "  \"wantedDockerImage\":\"docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.0\",\n" +
+                "  \"wantedVespaVersion\":\"6.42.0\",\n" +
+                "  \"rebootGeneration\": 1,\n" +
+                "  \"currentRebootGeneration\": 0,\n" +
+                "  \"failCount\": 0,\n" +
+                "  \"wantToRetire\" : false,\n" +
+                "  \"history\":[{\"type\":\"readied\",\"at\":123,\"type\":\"system\"},{\"type\":\"reserved\",\"at\":123,\"agent\":\"application\"},{\"type\":\"activated\",\"at\":123,\"agent\":\"application\"}],\n" +
+                "  \"ipAddresses\":[\"::1\", \"127.0.0.1\"]\n" +
+                "}";
+
+        node = nodeSerializer.fromJson(State.active, Utf8.toBytes(json));
+        assertEquals(Collections.emptySet(), node.additionalIpAddresses());
+    }
+
+    @Test
     public void want_to_retire_defaults_to_false() {
         String nodeData =
                 "{\n" +
@@ -331,7 +391,7 @@ public class SerializationTest {
     }
 
     private Node createNode() {
-        return Node.create("myId", singleton("127.0.0.1"), "myHostname", Optional.empty(), nodeFlavors.getFlavorOrThrow("default"), NodeType.host);
+        return Node.create("myId", singleton("127.0.0.1"), Collections.emptySet(), "myHostname", Optional.empty(), nodeFlavors.getFlavorOrThrow("default"), NodeType.host);
     }
 
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json
index 7a9a70b0f9d..e812b057953 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json
@@ -34,5 +34,6 @@
   "hardwareFailure" : false,
   "wantToRetire" : false,
   "history":[{"event":"readied","at":123,"agent":"system"},{"event":"reserved","at":123,"agent":"application"},{"event":"activated","at":123,"agent":"application"}],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json
index 9d37e94e623..1c1adb10d2b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json
@@ -39,5 +39,6 @@
   "hardwareFailure" : false,
   "wantToRetire" : false,
   "history":[{"event":"readied","at":123,"agent":"system"},{"event":"reserved","at":123,"agent":"application"}],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json
index 7a19b0fd80d..58bbd6f0128 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json
@@ -19,5 +19,6 @@
   "hardwareFailure":false,
   "wantToRetire":false,
   "history":[],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json
index e7d565bdd09..387464324dd 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json
@@ -34,5 +34,6 @@
   "hardwareFailure" : false,
   "wantToRetire" : false,
   "history":[{"event":"readied","at":123,"agent":"system"},{"event":"reserved","at":123,"agent":"application"},{"event":"activated","at":123,"agent":"application"}],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json
index 483e90b2641..65531808404 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json
@@ -32,5 +32,6 @@
   "hardwareFailure" : false,
   "wantToRetire" : false,
   "history":[{"event":"readied","at":123,"agent":"system"},{"event":"reserved","at":123,"agent":"application"},{"event":"activated","at":123,"agent":"application"}],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json
index 6e0ac0c9e2b..72d4ac75e72 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json
@@ -56,5 +56,6 @@
       "agent": "system"
     }
   ],
-  "ipAddresses":["127.0.0.1", "::1"]
+  "ipAddresses":["127.0.0.1", "::1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json
index 5278f0dd6bf..105473e8247 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json
@@ -37,5 +37,6 @@
   "hardwareFailure" : false,
   "wantToRetire" : false,
   "history":[{"event":"readied","at":123,"agent":"system"},{"event":"reserved","at":123,"agent":"application"}],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json
index c61ef5f230a..1cbb6be6213 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json
@@ -19,5 +19,6 @@
   "hardwareFailure": false,
   "wantToRetire": false,
   "history":[{"event":"readied","at":123,"agent":"system"},{"event":"failed","at":123,"agent":"system"}],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json
index 6ec3a7562ac..495e79787fd 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json
@@ -21,5 +21,6 @@
   "hardwareFailure" : false,
   "wantToRetire" : false,
   "history":[{"event":"readied","at":123,"agent":"system"},{"event":"failed","at":123,"agent":"system"}],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json
index e1aa82365a0..eb8355626f7 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json
@@ -18,5 +18,6 @@
   "hardwareFailure" : false,
   "wantToRetire" : false,
   "history":[{"event":"deallocated","at":123,"agent":"system"}],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json
index 0a3961d7217..ba9802da05f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json
@@ -34,5 +34,6 @@
   "hardwareFailure" : false,
   "wantToRetire" : false,
   "history":[{"event":"readied","at":123,"agent":"system"},{"event":"reserved","at":123,"agent":"application"},{"event":"activated","at":123,"agent":"application"}],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json
index bad845168d5..726e5627839 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json
@@ -18,5 +18,6 @@
   "hardwareFailure" : false,
   "wantToRetire" : false,
   "history":[],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json
index 8ad07b32202..ea040be7152 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json
@@ -18,5 +18,6 @@
   "hardwareFailure" : false,
   "wantToRetire" : false,
   "history":[],
-  "ipAddresses":["127.0.0.1"]
+  "ipAddresses":["127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json
index e27f7539a11..0c894a5802d 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json
@@ -18,5 +18,6 @@
   "hardwareFailure" : false,
   "wantToRetire" : false,
   "history":[],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json
index 536d26206bf..d96afb70967 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json
@@ -24,5 +24,6 @@
       "agent": "system"
     }
   ],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json
index 5c2101b75a1..844364d34c5 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json
@@ -18,5 +18,6 @@
   "hardwareFailure": false,
   "wantToRetire" : false,
   "history": [],
-  "ipAddresses":["::1", "127.0.0.1"]
+  "ipAddresses":["::1", "127.0.0.1"],
+  "additionalIpAddresses":[]
 }