diff options
Diffstat (limited to 'node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java')
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java index 9e57ae6dcd6..3e42a0efad7 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.maintenance; -import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationName; @@ -78,13 +77,8 @@ public class NodeFailTester { private final Orchestrator orchestrator; private final NodeRepositoryProvisioner provisioner; private final Curator curator; - private final ConfigserverConfig configserverConfig; private NodeFailTester() { - this(new ConfigserverConfig(new ConfigserverConfig.Builder())); - } - - private NodeFailTester(ConfigserverConfig configserverConfig) { clock = new ManualClock(); curator = new MockCurator(); nodeRepository = new NodeRepository(nodeFlavors, curator, clock, zone, new MockNameResolver().mockAnyLookup(), @@ -92,15 +86,10 @@ public class NodeFailTester { provisioner = new NodeRepositoryProvisioner(nodeRepository, nodeFlavors, zone, new MockProvisionServiceProvider(), new InMemoryFlagSource()); hostLivenessTracker = new TestHostLivenessTracker(clock); orchestrator = new OrchestratorMock(); - this.configserverConfig = configserverConfig; } public static NodeFailTester withTwoApplications() { - return withTwoApplications(new ConfigserverConfig(new ConfigserverConfig.Builder())); - } - - public static NodeFailTester withTwoApplications(ConfigserverConfig configserverConfig) { - NodeFailTester tester = new NodeFailTester(configserverConfig); + NodeFailTester tester = new NodeFailTester(); tester.createReadyNodes(16, nodeResources); tester.createHostNodes(3); @@ -209,7 +198,7 @@ public class NodeFailTester { } public NodeFailer createFailer() { - return new NodeFailer(deployer, hostLivenessTracker, serviceMonitor, nodeRepository, downtimeLimitOneHour, clock, orchestrator, NodeFailer.ThrottlePolicy.hosted, metric, configserverConfig); + return new NodeFailer(deployer, hostLivenessTracker, serviceMonitor, nodeRepository, downtimeLimitOneHour, clock, orchestrator, NodeFailer.ThrottlePolicy.hosted, metric); } public void allNodesMakeAConfigRequestExcept(Node ... deadNodeArray) { |