Violation of parent host policy if reserved to different tenant

1 files changed, 7 insertions, 0 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
index bbd763eea45..e5202dfd3c0 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
@@ -275,6 +275,13 @@ public class CapacityChecker {
     private static boolean violatesParentHostPolicy(Node node, Node host, Map<Node, List<Allocation>> containedAllocations) {
         if (node.allocation().isEmpty()) return false;
         Allocation nodeAllocation = node.allocation().get();
+
+        if (host.reservedTo()
+                .filter(tenantName -> !tenantName.equals(nodeAllocation.owner().tenant()))
+                .isPresent()) {
+            return true;
+        }
+
         for (var allocation : containedAllocations.get(host)) {
             if (allocation.membership().cluster().satisfies(nodeAllocation.membership().cluster())
                     && allocation.owner().equals(nodeAllocation.owner())) {