Set pool addresses when generating host

5 files changed, 40 insertions, 13 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
index 7bb47185751..65d6f2a5fa6 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java
@@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -29,6 +28,8 @@ public class NodeRepositoryNode {
     private Set<String> ipAddresses;
     @JsonProperty("additionalIpAddresses")
     private Set<String> additionalIpAddresses;
+    @JsonProperty("additionalHostnames")
+    private List<String> additionalHostnames;
     @JsonProperty("openStackId")
     private String openStackId;
     @JsonProperty("flavor")
@@ -142,6 +143,14 @@ public class NodeRepositoryNode {
         this.additionalIpAddresses = additionalIpAddresses;
     }
 
+    public List<String> getAdditionalHostnames() {
+        return additionalHostnames;
+    }
+
+    public void setAdditionalHostnames(List<String> additionalHostnames) {
+        this.additionalHostnames = additionalHostnames;
+    }
+
     public String getOpenStackId() {
         return openStackId;
     }
@@ -397,6 +406,7 @@ public class NodeRepositoryNode {
                ", hostname='" + hostname + '\'' +
                ", ipAddresses=" + ipAddresses +
                ", additionalIpAddresses=" + additionalIpAddresses +
+               ", additionalHostnames=" + additionalHostnames +
                ", openStackId='" + openStackId + '\'' +
                ", flavor='" + flavor + '\'' +
                ", resources=" + resources +
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java
index 61cedbb9373..02621c79019 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java
@@ -7,10 +7,12 @@ import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.vespa.hosted.provision.Node;
+import com.yahoo.vespa.hosted.provision.node.Address;
 import com.yahoo.vespa.hosted.provision.node.IP;
 import com.yahoo.vespa.hosted.provision.node.OsVersion;
 import com.yahoo.vespa.hosted.provision.node.Status;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -26,25 +28,33 @@ public class ProvisionedHost {
     private final String hostHostname;
     private final Flavor hostFlavor;
     private final Optional<ApplicationId> exclusiveTo;
-    private final String nodeHostname;
+    private final List<Address> nodeAddresses;
     private final NodeResources nodeResources;
     private final Version osVersion;
 
     public ProvisionedHost(String id, String hostHostname, Flavor hostFlavor, Optional<ApplicationId> exclusiveTo,
-                           String nodeHostname, NodeResources nodeResources, Version osVersion) {
+                           List<Address> nodeAddresses, NodeResources nodeResources, Version osVersion) {
         this.id = Objects.requireNonNull(id, "Host id must be set");
         this.hostHostname = Objects.requireNonNull(hostHostname, "Host hostname must be set");
         this.hostFlavor = Objects.requireNonNull(hostFlavor, "Host flavor must be set");
         this.exclusiveTo = Objects.requireNonNull(exclusiveTo, "exclusiveTo must be set");
-        this.nodeHostname = Objects.requireNonNull(nodeHostname, "Node hostname must be set");
+        this.nodeAddresses = validateNodeAddresses(nodeAddresses);
         this.nodeResources = Objects.requireNonNull(nodeResources, "Node resources must be set");
         this.osVersion = Objects.requireNonNull(osVersion, "OS version must be set");
     }
 
+    private static List<Address> validateNodeAddresses(List<Address> nodeAddresses) {
+        Objects.requireNonNull(nodeAddresses, "Node addresses must be set");
+        if (nodeAddresses.isEmpty()) {
+            throw new IllegalArgumentException("There must be at least one node address");
+        }
+        return nodeAddresses;
+    }
+
     /** Generate {@link Node} instance representing the provisioned physical host */
     public Node generateHost() {
         Node.Builder builder = Node
-                .create(id, IP.Config.EMPTY, hostHostname, hostFlavor, NodeType.host)
+                .create(id, IP.Config.of(Set.of(), Set.of(), nodeAddresses), hostHostname, hostFlavor, NodeType.host)
                 .status(Status.initial().withOsVersion(OsVersion.EMPTY.withCurrent(Optional.of(osVersion))));
         exclusiveTo.ifPresent(builder::exclusiveTo);
         return builder.build();
@@ -52,7 +62,7 @@ public class ProvisionedHost {
 
     /** Generate {@link Node} instance representing the node running on this physical host */
     public Node generateNode() {
-        return Node.createDockerNode(Set.of(), nodeHostname, hostHostname, nodeResources, NodeType.tenant).build();
+        return Node.createDockerNode(Set.of(), nodeHostname(), hostHostname, nodeResources, NodeType.tenant).build();
     }
 
     public String getId() {
@@ -68,7 +78,11 @@ public class ProvisionedHost {
     }
 
     public String nodeHostname() {
-        return nodeHostname;
+        return nodeAddresses.get(0).hostname();
+    }
+
+    public List<Address> nodeAddresses() {
+        return nodeAddresses;
     }
 
     public NodeResources nodeResources() { return nodeResources; }
@@ -81,14 +95,14 @@ public class ProvisionedHost {
         return id.equals(that.id) &&
                hostHostname.equals(that.hostHostname) &&
                hostFlavor.equals(that.hostFlavor) &&
-               nodeHostname.equals(that.nodeHostname) &&
+               nodeAddresses.equals(that.nodeAddresses) &&
                nodeResources.equals(that.nodeResources) &&
                osVersion.equals(that.osVersion);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, hostHostname, hostFlavor, nodeHostname, nodeResources, osVersion);
+        return Objects.hash(id, hostHostname, hostFlavor, nodeAddresses, nodeResources, osVersion);
     }
 
     @Override
@@ -97,7 +111,7 @@ public class ProvisionedHost {
                "id='" + id + '\'' +
                ", hostHostname='" + hostHostname + '\'' +
                ", hostFlavor=" + hostFlavor +
-               ", nodeHostname='" + nodeHostname + '\'' +
+               ", nodeAddresses='" + nodeAddresses + '\'' +
                ", nodeResources=" + nodeResources +
                ", osVersion=" + osVersion +
                '}';
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
index 4d8b6d13a86..3faa4c244ee 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
@@ -20,6 +20,7 @@ import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.Nodelike;
 import com.yahoo.vespa.hosted.provision.applications.Application;
+import com.yahoo.vespa.hosted.provision.node.Address;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.node.IP;
 import com.yahoo.vespa.hosted.provision.provisioning.FatalProvisioningException;
@@ -294,7 +295,7 @@ class AutoscalingTester {
                                               "hostname" + index,
                                               hostFlavor,
                                               Optional.empty(),
-                                              "nodename" + index,
+                                              List.of(new Address("nodename" + index)),
                                               resources,
                                               osVersion));
             }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
index 478376bc0cd..22eec482b02 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
@@ -20,6 +20,7 @@ import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.flags.custom.HostCapacity;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
+import com.yahoo.vespa.hosted.provision.node.Address;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.node.Allocation;
 import com.yahoo.vespa.hosted.provision.node.Generation;
@@ -338,7 +339,7 @@ public class DynamicProvisioningMaintainerTest {
                                               "hostname" + index,
                                               hostFlavor,
                                               Optional.empty(),
-                                              "nodename" + index,
+                                              List.of(new Address("nodename" + index)),
                                               resources,
                                               osVersion));
             }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
index 4917a59879f..919d02c435c 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
@@ -20,6 +20,7 @@ import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeList;
+import com.yahoo.vespa.hosted.provision.node.Address;
 import com.yahoo.vespa.hosted.provision.node.Agent;
 import com.yahoo.vespa.hosted.provision.node.IP;
 import com.yahoo.vespa.hosted.provision.provisioning.HostProvisioner.HostSharing;
@@ -471,7 +472,7 @@ public class DynamicDockerProvisionTest {
                 throw new OutOfCapacityException("No host flavor matches " + resources);
             return provisionIndexes.stream()
                                    .map(i -> new ProvisionedHost("id-" + i, "host-" + i, hostFlavor.get(), Optional.empty(),
-                                           "host-" + i + "-1", resources, osVersion))
+                                           List.of(new Address("host-" + i + "-1")), resources, osVersion))
                                    .collect(Collectors.toList());
         }