Keep IP sets sorted

30 files changed, 180 insertions, 99 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 497d7cb9d7e..bb7a79a3cbc 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
@@ -1,7 +1,7 @@
 // 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.provision;
 
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.net.InetAddresses;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterMembership;
@@ -11,8 +11,8 @@ import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.node.Allocation;
 import com.yahoo.vespa.hosted.provision.node.Generation;
 import com.yahoo.vespa.hosted.provision.node.History;
-import com.yahoo.vespa.hosted.provision.node.Status;
 import com.yahoo.vespa.hosted.provision.node.IP;
+import com.yahoo.vespa.hosted.provision.node.Status;
 
 import java.time.Instant;
 import java.util.Objects;
@@ -79,7 +79,7 @@ public final class Node {
         Objects.requireNonNull(type, "A null node type is not permitted");
 
         this.id = hostname;
-        this.ipAddresses = ImmutableSet.copyOf(ipAddresses);
+        this.ipAddresses = ImmutableSortedSet.copyOf(IP.naturalOrder, ipAddresses);
         this.ipAddressPool = new IP.AddressPool(this, ipAddressPool);
         this.hostname = hostname;
         this.parentHostname = parentHostname;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
index 2dfb1e12df6..c714d1d2231 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
@@ -1,8 +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.provision.node;
 
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.net.InetAddresses;
+import com.google.common.primitives.UnsignedBytes;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.persistence.NameResolver;
@@ -10,6 +11,7 @@ import com.yahoo.vespa.hosted.provision.persistence.NameResolver;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.LinkedHashSet;
 import java.util.Objects;
 import java.util.Optional;
@@ -22,6 +24,31 @@ import java.util.Set;
  */
 public class IP {
 
+    /** Comparator for sorting IP addresses by their natural order */
+    public static final Comparator<String> naturalOrder = (ip1, ip2) -> {
+        byte[] address1 = InetAddresses.forString(ip1).getAddress();
+        byte[] address2 = InetAddresses.forString(ip2).getAddress();
+
+        // IPv4 always sorts before IPv6
+        if (address1.length < address2.length) return -1;
+        if (address1.length > address2.length) return 1;
+
+        // Compare each octet
+        for (int i = 0; i < address1.length; i++) {
+            int b1 = UnsignedBytes.toInt(address1[i]);
+            int b2 = UnsignedBytes.toInt(address2[i]);
+            if (b1 == b2) {
+                continue;
+            }
+            if (b1 < b2) {
+                return -1;
+            } else {
+                return 1;
+            }
+        }
+        return 0;
+    };
+
     /** A pool of available IP addresses */
     public static class AddressPool {
 
@@ -30,7 +57,7 @@ public class IP {
 
         public AddressPool(Node owner, Set<String> addresses) {
             this.owner = Objects.requireNonNull(owner, "owner must be non-null");
-            this.addresses = ImmutableSet.copyOf(requireAddresses(addresses));
+            this.addresses = ImmutableSortedSet.copyOf(naturalOrder, requireAddresses(addresses));
         }
 
         /**
@@ -138,7 +165,7 @@ public class IP {
 
         /** All IP addresses in this */
         public Set<String> addresses() {
-            ImmutableSet.Builder<String> builder = ImmutableSet.builder();
+            ImmutableSortedSet.Builder<String> builder = ImmutableSortedSet.orderedBy(naturalOrder);
             builder.add(ipv6Address);
             ipv4Address.ifPresent(builder::add);
             return builder.build();
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java
new file mode 100644
index 00000000000..fc28e1fdc8f
--- /dev/null
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/node/IPTest.java
@@ -0,0 +1,53 @@
+// 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.provision.node;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author mpolden
+ */
+public class IPTest {
+
+    @Test
+    public void test_natural_order() {
+        Set<String> ipAddresses = ImmutableSet.of(
+                "192.168.254.1",
+                "192.168.254.254",
+                "127.7.3.1",
+                "127.5.254.1",
+                "172.16.100.1",
+                "172.16.254.2",
+                "2001:db8:0:0:0:0:0:ffff",
+                "2001:db8:95a3:0:0:0:0:7334",
+                "2001:db8:85a3:0:0:8a2e:370:7334",
+                "::1",
+                "::10",
+                "::20");
+
+        assertEquals(
+                Arrays.asList(
+                        "127.5.254.1",
+                        "127.7.3.1",
+                        "172.16.100.1",
+                        "172.16.254.2",
+                        "192.168.254.1",
+                        "192.168.254.254",
+                        "::1",
+                        "::10",
+                        "::20",
+                        "2001:db8:0:0:0:0:0:ffff",
+                        "2001:db8:85a3:0:0:8a2e:370:7334",
+                        "2001:db8:95a3:0:0:0:0:7334"),
+                new ArrayList<>(ImmutableSortedSet.copyOf(IP.naturalOrder, ipAddresses))
+        );
+    }
+
+}
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java
index 2875d4e4cf9..ff51869273d 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java
@@ -278,8 +278,8 @@ public class DynamicDockerProvisioningTest {
         tester.activate(application, hosts);
 
         List<Node> activeNodes = tester.nodeRepository().getNodes(application);
-        assertEquals(ImmutableSet.of("::12", "127.0.127.12"), activeNodes.get(0).ipAddresses());
-        assertEquals(ImmutableSet.of("::2", "127.0.127.2"), activeNodes.get(1).ipAddresses());
+        assertEquals(ImmutableSet.of("127.0.127.12", "::12"), activeNodes.get(0).ipAddresses());
+        assertEquals(ImmutableSet.of("127.0.127.2", "::2"), activeNodes.get(1).ipAddresses());
     }
 
     private ApplicationId makeApplicationId(String tenant, String appName) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-config-server.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-config-server.json
index e599d5a7b0b..92b5885cde4 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-config-server.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-config-server.json
@@ -15,17 +15,11 @@
     {
       "hostname": "dockerhost1.yahoo.com",
       "type": "host",
-      "ipAddress": "::1",
-      "trustedBy": "cfg1.yahoo.com"
-    },
-    {
-      "hostname": "dockerhost1.yahoo.com",
-      "type": "host",
       "ipAddress": "127.0.0.1",
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "dockerhost2.yahoo.com",
+      "hostname": "dockerhost1.yahoo.com",
       "type": "host",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -37,7 +31,7 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "dockerhost3.yahoo.com",
+      "hostname": "dockerhost2.yahoo.com",
       "type": "host",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -49,7 +43,7 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "dockerhost4.yahoo.com",
+      "hostname": "dockerhost3.yahoo.com",
       "type": "host",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -61,7 +55,7 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "dockerhost5.yahoo.com",
+      "hostname": "dockerhost4.yahoo.com",
       "type": "host",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -73,8 +67,8 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "host1.yahoo.com",
-      "type": "tenant",
+      "hostname": "dockerhost5.yahoo.com",
+      "type": "host",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
     },
@@ -85,7 +79,7 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "host10.yahoo.com",
+      "hostname": "host1.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -97,7 +91,7 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "host2.yahoo.com",
+      "hostname": "host10.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -109,7 +103,7 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "host3.yahoo.com",
+      "hostname": "host2.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -121,7 +115,7 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "host4.yahoo.com",
+      "hostname": "host3.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -133,7 +127,7 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "host5.yahoo.com",
+      "hostname": "host4.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -145,7 +139,7 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "host55.yahoo.com",
+      "hostname": "host5.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -157,7 +151,7 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "host6.yahoo.com",
+      "hostname": "host55.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -169,7 +163,7 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
-      "hostname": "host7.yahoo.com",
+      "hostname": "host6.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "cfg1.yahoo.com"
@@ -181,6 +175,12 @@
       "trustedBy": "cfg1.yahoo.com"
     },
     {
+      "hostname": "host7.yahoo.com",
+      "type": "tenant",
+      "ipAddress": "::1",
+      "trustedBy": "cfg1.yahoo.com"
+    },
+    {
       "hostname": "test-container-1",
       "type": "tenant",
       "ipAddress": "::2",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-docker-host.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-docker-host.json
index abf3c39001f..65db11acf08 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-docker-host.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-docker-host.json
@@ -15,37 +15,37 @@
     {
       "hostname": "dockerhost1.yahoo.com",
       "type": "host",
-      "ipAddress": "::1",
+      "ipAddress": "127.0.0.1",
       "trustedBy": "host4.yahoo.com"
     },
     {
       "hostname": "dockerhost1.yahoo.com",
       "type": "host",
-      "ipAddress": "127.0.0.1",
+      "ipAddress": "::1",
       "trustedBy": "host4.yahoo.com"
     },
     {
       "hostname": "dockerhost3.yahoo.com",
       "type": "host",
-      "ipAddress": "::1",
+      "ipAddress": "127.0.0.1",
       "trustedBy": "host4.yahoo.com"
     },
     {
       "hostname": "dockerhost3.yahoo.com",
       "type": "host",
-      "ipAddress": "127.0.0.1",
+      "ipAddress": "::1",
       "trustedBy": "host4.yahoo.com"
     },
     {
       "hostname": "host4.yahoo.com",
       "type": "tenant",
-      "ipAddress": "::1",
+      "ipAddress": "127.0.0.1",
       "trustedBy": "host4.yahoo.com"
     },
     {
       "hostname": "host4.yahoo.com",
       "type": "tenant",
-      "ipAddress": "127.0.0.1",
+      "ipAddress": "::1",
       "trustedBy": "host4.yahoo.com"
     },
     {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-tenant-node.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-tenant-node.json
index 4e1ba2271d9..66d92ecc9fe 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-tenant-node.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-tenant-node.json
@@ -21,17 +21,11 @@
     {
       "hostname": "host1.yahoo.com",
       "type": "tenant",
-      "ipAddress": "::1",
-      "trustedBy": "foo.yahoo.com"
-    },
-    {
-      "hostname": "host1.yahoo.com",
-      "type": "tenant",
       "ipAddress": "127.0.0.1",
       "trustedBy": "foo.yahoo.com"
     },
     {
-      "hostname": "host10.yahoo.com",
+      "hostname": "host1.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "foo.yahoo.com"
@@ -43,7 +37,7 @@
       "trustedBy": "foo.yahoo.com"
     },
     {
-      "hostname": "host2.yahoo.com",
+      "hostname": "host10.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "foo.yahoo.com"
@@ -55,7 +49,7 @@
       "trustedBy": "foo.yahoo.com"
     },
     {
-      "hostname": "host3.yahoo.com",
+      "hostname": "host2.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "foo.yahoo.com"
@@ -67,7 +61,7 @@
       "trustedBy": "foo.yahoo.com"
     },
     {
-      "hostname": "host4.yahoo.com",
+      "hostname": "host3.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "foo.yahoo.com"
@@ -79,7 +73,7 @@
       "trustedBy": "foo.yahoo.com"
     },
     {
-      "hostname": "host5.yahoo.com",
+      "hostname": "host4.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "foo.yahoo.com"
@@ -91,7 +85,7 @@
       "trustedBy": "foo.yahoo.com"
     },
     {
-      "hostname": "host55.yahoo.com",
+      "hostname": "host5.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "foo.yahoo.com"
@@ -103,7 +97,7 @@
       "trustedBy": "foo.yahoo.com"
     },
     {
-      "hostname": "host6.yahoo.com",
+      "hostname": "host55.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "foo.yahoo.com"
@@ -115,7 +109,7 @@
       "trustedBy": "foo.yahoo.com"
     },
     {
-      "hostname": "host7.yahoo.com",
+      "hostname": "host6.yahoo.com",
       "type": "tenant",
       "ipAddress": "::1",
       "trustedBy": "foo.yahoo.com"
@@ -127,6 +121,12 @@
       "trustedBy": "foo.yahoo.com"
     },
     {
+      "hostname": "host7.yahoo.com",
+      "type": "tenant",
+      "ipAddress": "::1",
+      "trustedBy": "foo.yahoo.com"
+    },
+    {
       "hostname": "test-container-1",
       "type": "tenant",
       "ipAddress": "::2",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json
index 7dbe7a100dc..e01264a0c9d 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json
@@ -62,8 +62,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": [
     "::2",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json
index 72280f91cc9..5eebea57890 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json
@@ -61,8 +61,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": [
     "::2",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json
index fac2813f6c5..213ebc5440f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json
@@ -60,8 +60,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": [
     "::2",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json
index d90649cb7a5..eb0dc65e61b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json
@@ -60,8 +60,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": [
     "::2",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json
index 5fc6d432e29..326476f783a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json
@@ -60,8 +60,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": [
     "::2",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json
index 7624340c553..c202376af9b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json
@@ -60,8 +60,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": [
     "::2",
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json
index e9a7f153bb5..3149a39ef32 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json
@@ -60,8 +60,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": [
     "::2",
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 794082db0c1..7d979676173 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
@@ -55,8 +55,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": []
-}
\ No newline at end of file
+}
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 9b18c8ea52c..847fbd47bb7 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
@@ -58,8 +58,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::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 ae0354b4d27..b1329eebb2d 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
@@ -29,8 +29,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": [
     "::10",
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 5835d718f50..64b64888bcd 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
@@ -60,8 +60,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": []
-}
\ No newline at end of file
+}
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 7a36c26f385..66fa0179c35 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
@@ -34,8 +34,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": []
-}
\ No newline at end of file
+}
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 87a4a355b57..a02035efd88 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
@@ -63,8 +63,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::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 4c22b4397e0..8eb3a74ce2a 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
@@ -39,8 +39,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": []
-}
\ No newline at end of file
+}
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 4e1032442b3..a14443e096d 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
@@ -41,8 +41,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": []
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55-after-changes.json
index 18d019c4b6e..16ec6fe4a99 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55-after-changes.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55-after-changes.json
@@ -33,8 +33,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::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 9d2c67ffcb7..aca7875db31 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
@@ -33,8 +33,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": []
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json
index 3e33cfb7a8d..a15b62a6dd4 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json
@@ -60,8 +60,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": [],
   "hardwareDivergence": "{\"actualCpuCores\":2}"
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 f0c63048dcc..c1321aa113a 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
@@ -60,8 +60,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": []
-}
\ No newline at end of file
+}
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 53a6e5c8d77..e6e06c74cdc 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
@@ -28,8 +28,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::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 8fb4372fb80..019eef8c1f2 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
@@ -28,7 +28,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"],
+    "127.0.0.1",
+    "::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 10eaeba153a..afe0fc5f2e1 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
@@ -33,8 +33,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::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 74c65d30f34..45668ca341d 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
@@ -28,8 +28,8 @@
     }
   ],
   "ipAddresses": [
-    "::1",
-    "127.0.0.1"
+    "127.0.0.1",
+    "::1"
   ],
   "additionalIpAddresses": []
 }