diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-30 12:25:22 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-30 12:25:22 +0200 |
| commit | 19af53e11242e39de6ea6df28c7826f61d65e11a (patch) | |
| tree | bed439390c23d117faf612a44624e537b6af2436 /node-repository | |
| parent | c02b03c75792d050c3075935604b37d9e5e6caf9 (diff) | |
Compare even more correctly
Diffstat (limited to 'node-repository')
2 files changed, 6 insertions, 4 deletions
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()); |