Merge pull request #12762 from vespa-engine/bratseth/compare-even-more-correctly

Compare even more correctly

3 files changed, 7 insertions, 5 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java
index d87e03c2797..a4ed22c5266 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java
@@ -59,7 +59,7 @@ public class ClusterResources {
         ClusterResources other = (ClusterResources)o;
         if (other.nodes != this.nodes) return false;
         if (other.groups != this.groups) return false;
-        if (other.nodeResources.equals(this.nodeResources)) return false;
+        if ( ! other.nodeResources.equals(this.nodeResources)) return false;
         return true;
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
index d1cd4752c93..f010e6905e1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.provision.provisioning;
 
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Capacity;
-import com.yahoo.config.provision.ClusterResources;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.NodeResources;
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java
index 413c14d132d..da169cba08f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java
@@ -67,9 +67,12 @@ public class AutoscalingMaintainerTest {
         tester.makeReadyNodes(20, "flt", NodeType.host, 8);
         tester.deployZoneApp();
 
-        tester.deploy(app1, cluster1, Capacity.from(new ClusterResources(5, 1, lowResources), false, true));
-        tester.deploy(app2, cluster2, Capacity.from(new ClusterResources(5, 1, lowResources),
-                                                    new ClusterResources(10, 1, highResources), false, true));
+        tester.deploy(app1, cluster1, Capacity.from(new ClusterResources(5, 1, new NodeResources(4, 4, 10, 0.1)),
+                                                    new ClusterResources(5, 1, new NodeResources(4, 4, 10, 0.1)),
+                                                    false, true));
+        tester.deploy(app2, cluster2, Capacity.from(new ClusterResources(5, 1, new NodeResources(4, 4, 10, 0.1)),
+                                                    new ClusterResources(10, 1, new NodeResources(6.5, 9, 20, 0.1)),
+                                                    false, true));
 
         maintainer.maintain(); // noop
         assertTrue(deployer.lastDeployTime(app1).isEmpty());