diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-05-02 10:49:56 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-02 10:49:56 +0200 |
commit | ec9d641119a6d41656c3902ed375702628ef5c9f (patch) | |
tree | fc1ea9b6c24ff127a9022df06614d3452600d657 /node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java | |
parent | 7c0f9bb894b037c9dcd577cf74e4c5e216530d9c (diff) |
Revert "Merge pull request #13131 from vespa-engine/revert-13128-bratseth/allow-non-allocatable-limits-take-2"
This reverts commit 78d7d808067a9189960f3cc2ad83237ba00efec5, reversing
changes made to e1d09983f5e952f44358ae5b247e5b76b2898d82.
Diffstat (limited to 'node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java')
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java index ddbbb8e4482..88804576310 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTester.java @@ -10,6 +10,7 @@ import com.yahoo.config.provisioning.FlavorsConfig; import com.yahoo.test.ManualClock; import com.yahoo.vespa.curator.mock.MockCurator; import com.yahoo.vespa.hosted.provision.node.Agent; +import com.yahoo.vespa.hosted.provision.provisioning.EmptyProvisionServiceProvider; import com.yahoo.vespa.hosted.provision.provisioning.FlavorConfigBuilder; import com.yahoo.vespa.hosted.provision.testutils.MockNameResolver; @@ -33,7 +34,11 @@ public class NodeRepositoryTester { clock = new ManualClock(); curator = new MockCurator(); curator.setZooKeeperEnsembleConnectionSpec("server1:1234,server2:5678"); - nodeRepository = new NodeRepository(nodeFlavors, curator, clock, Zone.defaultZone(), + nodeRepository = new NodeRepository(nodeFlavors, + new EmptyProvisionServiceProvider().getHostResourcesCalculator(), + curator, + clock, + Zone.defaultZone(), new MockNameResolver().mockAnyLookup(), DockerImage.fromString("docker-registry.domain.tld:8080/dist/vespa"), true); |