Use hostname convention more inline with prod

6 files changed, 20 insertions, 17 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java
index bff4a4b21de..290f7c3bbaf 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java
@@ -33,7 +33,7 @@ public class AutoscalingIntegrationTest {
         Autoscaler autoscaler = new Autoscaler(fixture.tester().nodeRepository());
 
         // The metrics response (below) hardcodes these hostnames:
-        assertEquals(Set.of("node-1-of-host-1.yahoo.com", "node-1-of-host-10.yahoo.com"), fixture.nodes().hostnames());
+        assertEquals(Set.of("host-1-1.yahoo.com", "host-10-1.yahoo.com"), fixture.nodes().hostnames());
 
         for (int i = 0; i < 1000; i++) {
             fixture.tester().clock().advance(Duration.ofSeconds(10));
@@ -58,7 +58,7 @@ public class AutoscalingIntegrationTest {
                 "{\n" +
                 "  \"nodes\": [\n" +
                 "    {\n" +
-                "      \"hostname\": \"node-1-of-host-1.yahoo.com\",\n" +
+                "      \"hostname\": \"host-1-1.yahoo.com\",\n" +
                 "      \"role\": \"role0\",\n" +
                 "      \"node\": {\n" +
                 "        \"timestamp\": [now],\n" +
@@ -77,7 +77,7 @@ public class AutoscalingIntegrationTest {
                 "      }\n" +
                 "    },\n" +
                 "    {\n" +
-                "      \"hostname\": \"node-1-of-host-10.yahoo.com\",\n" +
+                "      \"hostname\": \"host-10-1.yahoo.com\",\n" +
                 "      \"role\": \"role1\",\n" +
                 "      \"node\": {\n" +
                 "        \"timestamp\": [now],\n" +
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
index f3a4b5a9284..ede958ef083 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
@@ -23,9 +23,9 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static com.yahoo.vespa.hosted.provision.node.Report.Type.HARD_FAIL;
 import static org.junit.Assert.assertEquals;
@@ -647,9 +647,9 @@ public class NodeFailerTest {
                 .entrySet().stream()
                 .filter(entry -> entry.getValue().size() == n)
                 .map(Map.Entry::getKey)
-                .flatMap(parentHost -> Stream.of(parentHost.get()))
+                .flatMap(Optional::stream)
                 .filter(node -> ! exceptSet.contains(node))
-                .findFirst()
+                .min(Comparator.naturalOrder())
                 .orElseThrow();
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java
index b62c3399555..b9021bff3c3 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java
@@ -96,7 +96,7 @@ public class RebalancerTest {
         tester.maintain();
         assertTrue("Want to retire is reset", tester.getNodes(Node.State.active).stream().noneMatch(node -> node.status().wantToRetire()));
         assertEquals("Reserved node was moved to dirty", 2, tester.getNodes(Node.State.dirty).size());
-        String reservedHostname = tester.getNodes(Node.State.dirty).first().get().hostname();
+        String reservedHostname = tester.getNodes(Node.State.dirty).owner(memoryApp).first().get().hostname();
         tester.nodeRepository().nodes().setReady(reservedHostname, Agent.system, "Cleanup");
         tester.nodeRepository().nodes().removeRecursively(reservedHostname);
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java
index 2cc687e51d3..2327b40885f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicAllocationTest.java
@@ -340,8 +340,8 @@ public class DynamicAllocationTest {
         tester.activate(application, hosts);
 
         NodeList activeNodes = tester.nodeRepository().nodes().list().owner(application);
-        assertEquals(Set.of("127.0.127.13", "::d"), activeNodes.asList().get(0).ipConfig().primary());
-        assertEquals(Set.of("127.0.127.2", "::2"), activeNodes.asList().get(1).ipConfig().primary());
+        assertEquals(Set.of("127.0.127.2", "::2"), activeNodes.asList().get(0).ipConfig().primary());
+        assertEquals(Set.of("127.0.127.13", "::d"), activeNodes.asList().get(1).ipConfig().primary());
     }
 
     @Test
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
index 49a820f3291..45b5d9020d4 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
@@ -99,7 +99,8 @@ public class ProvisioningTest {
 
         // remove nodes before deploying
         SystemState state5 = prepare(application1, 2, 2, 3, 3, defaultResources, tester);
-        HostSpec removed = tester.removeOne(state5.allHosts);
+        HostSpec removed = tester.removeOne(state5.content0);
+        state5.allHosts.remove(removed);
         tester.activate(application1, state5.allHosts);
         assertEquals(removed.hostname(),
                      tester.nodeRepository().nodes().list(Node.State.inactive).owner(application1).first().get().hostname());
@@ -1102,11 +1103,11 @@ public class ProvisioningTest {
 
     private static class SystemState {
 
-        private Set<HostSpec> allHosts;
-        private Set<HostSpec> container0;
-        private Set<HostSpec> container1;
-        private Set<HostSpec> content0;
-        private Set<HostSpec> content1;
+        private final Set<HostSpec> allHosts;
+        private final Set<HostSpec> container0;
+        private final Set<HostSpec> container1;
+        private final Set<HostSpec> content0;
+        private final Set<HostSpec> content1;
 
         public SystemState(Set<HostSpec> allHosts,
                            Set<HostSpec> container1,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
index a7c4e8ecd7a..8affe516fa9 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
@@ -421,6 +421,7 @@ public class ProvisioningTester {
             }
 
             String hostname = nodeNamer.apply(nextHost);
+            String[] hostnameParts = hostname.split("\\.", 2);
             String ipv4 = String.format("127.0.%d.%d", nextIP / 256, nextIP % 256);
             String ipv6 = String.format("::%x", nextIP);
 
@@ -432,13 +433,14 @@ public class ProvisioningTester {
             Set<String> ipAddressPool = new LinkedHashSet<>();
             for (int poolIp = 1; poolIp <= ipAddressPoolSize; poolIp++) {
                 nextIP++;
+                String nodeHostname = hostnameParts[0] + "-" + poolIp + (hostnameParts.length > 1 ? "." + hostnameParts[1] : "");
                 String ipv6Addr = String.format("::%x", nextIP);
                 ipAddressPool.add(ipv6Addr);
-                nameResolver.addRecord(String.format("node-%d-of-%s", poolIp, hostname), ipv6Addr);
+                nameResolver.addRecord(nodeHostname, ipv6Addr);
                 if (dualStack) {
                     String ipv4Addr = String.format("127.0.%d.%d", (127 + (nextIP / 256)), nextIP % 256);
                     ipAddressPool.add(ipv4Addr);
-                    nameResolver.addRecord(String.format("node-%d-of-%s", poolIp, hostname), ipv4Addr);
+                    nameResolver.addRecord(nodeHostname, ipv4Addr);
                 }
             }
             Node.Builder builder = Node.create(hostname, new IP.Config(hostIps, ipAddressPool), hostname, flavor, type);