Propagate reservedTo

2 files changed, 14 insertions, 5 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AddNode.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AddNode.java
index 233fe8318ae..c1642c71e64 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AddNode.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/AddNode.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.node.admin.configserver.noderepository;
 
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.NodeType;
+import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.host.FlavorOverrides;
 
 import java.util.Objects;
@@ -19,26 +20,30 @@ public class AddNode {
     public final Optional<String> nodeFlavor;
     public final Optional<FlavorOverrides> flavorOverrides;
     public final Optional<NodeResources> nodeResources;
+    public final Optional<TenantName> reservedTo;
     public final NodeType nodeType;
     public final Set<String> ipAddresses;
     public final Set<String> additionalIpAddresses;
 
-    public static AddNode forHost(String hostname, String nodeFlavor, Optional<FlavorOverrides> flavorOverrides, NodeType nodeType, Set<String> ipAddresses, Set<String> additionalIpAddresses) {
-        return new AddNode(hostname, Optional.empty(), Optional.of(nodeFlavor), flavorOverrides, Optional.empty(), nodeType, ipAddresses, additionalIpAddresses);
+    public static AddNode forHost(String hostname, String nodeFlavor, Optional<FlavorOverrides> flavorOverrides, Optional<TenantName> reservedTo, NodeType nodeType, Set<String> ipAddresses, Set<String> additionalIpAddresses) {
+        return new AddNode(hostname, Optional.empty(), Optional.of(nodeFlavor), flavorOverrides, Optional.empty(), reservedTo, nodeType, ipAddresses, additionalIpAddresses);
     }
 
     public static AddNode forNode(String hostname, String parentHostname, NodeResources nodeResources, NodeType nodeType, Set<String> ipAddresses) {
-        return new AddNode(hostname, Optional.of(parentHostname), Optional.empty(), Optional.empty(), Optional.of(nodeResources), nodeType, ipAddresses, Set.of());
+        return new AddNode(hostname, Optional.of(parentHostname), Optional.empty(), Optional.empty(), Optional.of(nodeResources), Optional.empty(), nodeType, ipAddresses, Set.of());
     }
 
     private AddNode(String hostname, Optional<String> parentHostname,
-                    Optional<String> nodeFlavor, Optional<FlavorOverrides> flavorOverrides, Optional<NodeResources> nodeResources,
+                    Optional<String> nodeFlavor, Optional<FlavorOverrides> flavorOverrides,
+                    Optional<NodeResources> nodeResources,
+                    Optional<TenantName> reservedTo,
                     NodeType nodeType, Set<String> ipAddresses, Set<String> additionalIpAddresses) {
         this.hostname = hostname;
         this.parentHostname = parentHostname;
         this.nodeFlavor = nodeFlavor;
         this.flavorOverrides = flavorOverrides;
         this.nodeResources = nodeResources;
+        this.reservedTo = reservedTo;
         this.nodeType = nodeType;
         this.ipAddresses = ipAddresses;
         this.additionalIpAddresses = additionalIpAddresses;
@@ -52,6 +57,7 @@ public class AddNode {
         return Objects.equals(hostname, addNode.hostname) &&
                 Objects.equals(parentHostname, addNode.parentHostname) &&
                 Objects.equals(nodeFlavor, addNode.nodeFlavor) &&
+                Objects.equals(reservedTo, addNode.reservedTo) &&
                 nodeType == addNode.nodeType &&
                 Objects.equals(ipAddresses, addNode.ipAddresses) &&
                 Objects.equals(additionalIpAddresses, addNode.additionalIpAddresses);
@@ -59,7 +65,7 @@ public class AddNode {
 
     @Override
     public int hashCode() {
-        return Objects.hash(hostname, parentHostname, nodeFlavor, nodeType, ipAddresses, additionalIpAddresses);
+        return Objects.hash(hostname, parentHostname, nodeFlavor, reservedTo, nodeType, ipAddresses, additionalIpAddresses);
     }
 
     @Override
@@ -68,9 +74,11 @@ public class AddNode {
                 "hostname='" + hostname + '\'' +
                 ", parentHostname=" + parentHostname +
                 ", nodeFlavor='" + nodeFlavor + '\'' +
+               (reservedTo.isPresent() ? ", reservedTo='" + reservedTo.get().value() + "'" : "") +
                 ", nodeType=" + nodeType +
                 ", ipAddresses=" + ipAddresses +
                 ", additionalIpAddresses=" + additionalIpAddresses +
                 '}';
     }
+
 }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
index 4e0fd95384c..eadcd997ae8 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java
@@ -164,6 +164,7 @@ public class RealNodeRepositoryTest {
         AddNode host = AddNode.forHost("host123.domain.tld",
                                        "default",
                                        Optional.of(FlavorOverrides.ofDisk(123)),
+                                       Optional.empty(),
                                        NodeType.confighost,
                                        Set.of("::1"), Set.of("::2", "::3"));