diff options
author | Håkon Hallingstad <hakon@yahooinc.com> | 2023-05-09 11:32:21 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@yahooinc.com> | 2023-05-09 11:32:21 +0200 |
commit | f376fc3074ff05c57f9c750e34a7a58627b1b29b (patch) | |
tree | fd7988fc8121adac1cbdc8de844982bce4192ae1 /node-repository | |
parent | 748eacb6cbd133fdc3927cb8f626fff62127a59a (diff) |
Fix ProvisioningTester
Diffstat (limited to 'node-repository')
2 files changed, 5 insertions, 3 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java index d7e2dbb6f58..62f7b99f69f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java @@ -32,7 +32,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.function.Supplier; -import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; @@ -196,9 +195,11 @@ public class InactiveAndFailedExpirerTest { Supplier<Node> firstNode = () -> tester.nodeRepository().nodes().node(nodes.first().get().hostname()).get(); ApplicationId application = firstNode.get().allocation().get().owner(); - // Retired config server is moved to inactive + // Move retired config server to inactive via setRemovable tester.nodeRepository().nodes().retire(NodeListFilter.from(firstNode.get()), Agent.system, tester.clock().instant()); + tester.nodeRepository().nodes().setRemovable(NodeList.of(firstNode.get()), true); tester.prepareAndActivateInfraApplication(application, NodeType.config); + assertSame(Node.State.inactive, firstNode.get().state()); expirer.maintain(); assertSame(Node.State.inactive, firstNode.get().state()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java index d0ff11fde0c..15954401049 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java @@ -239,7 +239,8 @@ public class ProvisioningTester { } public List<HostSpec> prepareAndActivateInfraApplication(ApplicationId application, NodeType nodeType, Version version) { - ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from(nodeType.toString())) + ClusterSpec cluster = ClusterSpec.request(nodeType.isConfigServerLike() ? ClusterSpec.Type.admin : ClusterSpec.Type.container, + ClusterSpec.Id.from(nodeType == NodeType.config ? "zone-config-servers" : nodeType.toString())) .vespaVersion(version) .stateful(nodeType == NodeType.config || nodeType == NodeType.controller) .build(); |