Ress resources is not compatible with more resources

1 files changed, 14 insertions, 1 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
index 165b497252d..7e90767c9c5 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java
@@ -149,7 +149,7 @@ public class NodeResources {
         if (this.allocateByLegacyName || other.allocateByLegacyName) // resources are not available
             return Objects.equals(this.legacyName, other.legacyName);
 
-        if (this.vcpu < other.vcpu()) return false;
+        if (this.vcpu < other.vcpu) return false;
         if (this.memoryGb < other.memoryGb) return false;
         if (this.diskGb < other.diskGb) return false;
 
@@ -161,6 +161,19 @@ public class NodeResources {
         return true;
     }
 
+    /** Returns true if all the resources of this are the same as or compatible with the given resources */
+    public boolean compatibleWith(NodeResources other) {
+        if (this.allocateByLegacyName || other.allocateByLegacyName) // resources are not available
+            return Objects.equals(this.legacyName, other.legacyName);
+
+        if (this.vcpu != other.vcpu) return false;
+        if (this.memoryGb != other.memoryGb) return false;
+        if (this.diskGb != other.diskGb) return false;
+        if (other.diskSpeed != DiskSpeed.any && other.diskSpeed != this.diskSpeed) return false;
+
+        return true;
+    }
+
     /**
      * Create this from serial form.
      *