Merge pull request #28509 from vespa-engine/hakonhall/additionalIpAddresses-list

Change primary and pool IPs from Set to List

2 files changed, 5 insertions, 6 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
index 03923853594..5cdb08d6fc6 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
@@ -109,7 +109,7 @@ public class MockHostProvisioner implements HostProvisioner {
         Map<String, IP.Config> result = new HashMap<>();
         result.put(host.hostname(), createIpConfig(host));
         host.ipConfig().pool().hostnames().forEach(hostname ->
-                result.put(hostname.value(), IP.Config.ofEmptyPool(nameResolver.resolveAll(hostname.value()))));
+                result.put(hostname.value(), IP.Config.ofEmptyPool(List.copyOf(nameResolver.resolveAll(hostname.value())))));
         return new HostIpConfig(result, Optional.empty());
     }
 
@@ -238,8 +238,8 @@ public class MockHostProvisioner implements HostProvisioner {
     public IP.Config createIpConfig(Node node) {
         if (!node.type().isHost()) throw new IllegalArgumentException("Node " + node + " is not a host");
         int hostIndex = Integer.parseInt(node.hostname().replaceAll("^[a-z]+|-\\d+$", ""));
-        Set<String> addresses = Set.of("::" + hostIndex + ":0");
-        Set<String> ipAddressPool = new HashSet<>();
+        var addresses = List.of("::" + hostIndex + ":0");
+        var ipAddressPool = new ArrayList<String>();
         if (!behaviour(Behaviour.failDnsUpdate)) {
             nameResolver.addRecord(node.hostname(), addresses.iterator().next());
             int i = 1;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
index 086639d7276..72225763381 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
@@ -52,7 +52,6 @@ import java.time.Clock;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
 
@@ -274,8 +273,8 @@ public class MockNodeRepository extends NodeRepository {
     }
 
     private IP.Config ipConfig(int nodeIndex, int primarySize, int poolSize) {
-        var primary = new LinkedHashSet<String>();
-        var ipPool = new LinkedHashSet<String>();
+        var primary = new ArrayList<String>();
+        var ipPool = new ArrayList<String>();
         for (int i = 1; i <= primarySize + poolSize; i++) {
             var set = primary;
             if (i > primarySize) {