Only allow clearing reservedTo

2 files changed, 4 insertions, 4 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 858255264ea..3778b7aa625 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
@@ -294,10 +294,10 @@ public final class Node {
                         allocation, history, type, reports, modelName, reservedTo);
     }
 
-    /** Returns a copy of this node marked as reserved to the given tenant (or empty to remove reservation) */
-    public Node withReservedTo(Optional<TenantName> reservedTo) {
+    /** Returns a copy of this node which is not reserved to a tenant */
+    public Node withoutReservedTo() {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state,
-                        allocation, history, type, reports, modelName, reservedTo);
+                        allocation, history, type, reports, modelName, Optional.empty());
     }
 
     /** Returns a copy of this node with the current reboot generation set to the given number at the given instant */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java
index ebd56229312..57f75159093 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java
@@ -106,7 +106,7 @@ class Activator {
         try (Mutex lock = nodeRepository.lockUnallocated()) {
             List<Node> unreserved = reservedParents.stream()
                                                    .map(hostname -> nodeRepository.getNode(hostname).get())
-                                                   .map(host -> host.withReservedTo(Optional.empty()))
+                                                   .map(host -> host.withoutReservedTo())
                                                    .collect(Collectors.toList());
             nodeRepository.write(unreserved, lock);
         }