From 4dffbb6339ca7ae1cee0d4a7ec40d960aac8abff Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Wed, 14 Apr 2021 10:00:19 +0200 Subject: Move all hosts to deprovisioned on deletion --- .../yahoo/vespa/hosted/provision/NodeRepositoryTest.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'node-repository/src/test/java') diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java index 1ec462b0620..f4cd5f5eeb5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java @@ -11,6 +11,7 @@ import org.junit.Test; import java.time.Duration; import java.time.Instant; +import java.util.List; import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -36,14 +37,17 @@ public class NodeRepositoryTest { tester.addHost("id1", "host1", "default", NodeType.host); tester.addHost("id2", "host2", "default", NodeType.host); tester.addHost("id3", "host3", "default", NodeType.host); + tester.addHost("id4", "cfghost1", "default", NodeType.confighost); - assertEquals(3, tester.nodeRepository().nodes().list().size()); - - tester.nodeRepository().nodes().park("host2", true, Agent.system, "Parking to unit test"); - tester.nodeRepository().nodes().removeRecursively("host2"); + assertEquals(4, tester.nodeRepository().nodes().list().size()); + + for (var hostname : List.of("host2", "cfghost1")) { + tester.nodeRepository().nodes().park(hostname, true, Agent.system, "Parking to unit test"); + tester.nodeRepository().nodes().removeRecursively(hostname); + } - assertEquals(3, tester.nodeRepository().nodes().list().size()); - assertEquals(1, tester.nodeRepository().nodes().list(Node.State.deprovisioned).size()); + assertEquals(4, tester.nodeRepository().nodes().list().size()); + assertEquals(2, tester.nodeRepository().nodes().list(Node.State.deprovisioned).size()); } @Test -- cgit v1.2.3