diff options
Diffstat (limited to 'node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java')
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java | 22 |
1 files changed, 11 insertions, 11 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 20c1bd78a52..4bee276af6d 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 @@ -65,14 +65,14 @@ public class InactiveAndFailedExpirerTest { // Inactive times out tester.advanceTime(Duration.ofMinutes(14)); new InactiveExpirer(tester.nodeRepository(), Duration.ofMinutes(10), new TestMetric()).run(); - assertEquals(0, tester.nodeRepository().getNodes(Node.State.inactive).size()); - List<Node> dirty = tester.nodeRepository().getNodes(Node.State.dirty); + assertEquals(0, tester.nodeRepository().nodes().getNodes(Node.State.inactive).size()); + List<Node> dirty = tester.nodeRepository().nodes().getNodes(Node.State.dirty); assertEquals(2, dirty.size()); assertFalse(dirty.get(0).allocation().isPresent()); assertFalse(dirty.get(1).allocation().isPresent()); // One node is set back to ready - Node ready = tester.nodeRepository().setReady(Collections.singletonList(dirty.get(0)), Agent.system, getClass().getSimpleName()).get(0); + Node ready = tester.nodeRepository().nodes().setReady(Collections.singletonList(dirty.get(0)), Agent.system, getClass().getSimpleName()).get(0); assertEquals("Allocated history is removed on readying", Arrays.asList(History.Event.Type.provisioned, History.Event.Type.readied), ready.history().events().stream().map(History.Event::type).collect(Collectors.toList())); @@ -80,8 +80,8 @@ public class InactiveAndFailedExpirerTest { // Dirty times out for the other one tester.advanceTime(Duration.ofMinutes(14)); new DirtyExpirer(tester.nodeRepository(), Duration.ofMinutes(10), new TestMetric()).run(); - assertEquals(0, tester.nodeRepository().getNodes(NodeType.tenant, Node.State.dirty).size()); - List<Node> failed = tester.nodeRepository().getNodes(NodeType.tenant, Node.State.failed); + assertEquals(0, tester.nodeRepository().nodes().getNodes(NodeType.tenant, Node.State.dirty).size()); + List<Node> failed = tester.nodeRepository().nodes().getNodes(NodeType.tenant, Node.State.failed); assertEquals(1, failed.size()); assertEquals(1, failed.get(0).status().failCount()); } @@ -108,7 +108,7 @@ public class InactiveAndFailedExpirerTest { // Inactive times out and node is moved to dirty tester.advanceTime(Duration.ofMinutes(14)); new InactiveExpirer(tester.nodeRepository(), Duration.ofMinutes(10), new TestMetric()).run(); - List<Node> dirty = tester.nodeRepository().getNodes(Node.State.dirty); + List<Node> dirty = tester.nodeRepository().nodes().getNodes(Node.State.dirty); assertEquals(2, dirty.size()); // Reboot generation is increased @@ -154,12 +154,12 @@ public class InactiveAndFailedExpirerTest { doThrow(new RuntimeException()).when(orchestrator).acquirePermissionToRemove(any()); new RetiredExpirer(tester.nodeRepository(), tester.orchestrator(), deployer, new TestMetric(), Duration.ofDays(30), Duration.ofMinutes(10)).run(); - assertEquals(1, tester.nodeRepository().getNodes(Node.State.inactive).size()); + assertEquals(1, tester.nodeRepository().nodes().getNodes(Node.State.inactive).size()); // Inactive times out and one node is moved to parked tester.advanceTime(Duration.ofMinutes(11)); // Trigger InactiveExpirer new InactiveExpirer(tester.nodeRepository(), Duration.ofMinutes(10), new TestMetric()).run(); - assertEquals(1, tester.nodeRepository().getNodes(Node.State.parked).size()); + assertEquals(1, tester.nodeRepository().nodes().getNodes(Node.State.parked).size()); } @Test @@ -181,8 +181,8 @@ public class InactiveAndFailedExpirerTest { // See that nodes are moved to dirty immediately. new InactiveExpirer(tester.nodeRepository(), Duration.ofMinutes(10), new TestMetric()).run(); - assertEquals(0, tester.nodeRepository().getNodes(Node.State.inactive).size()); - List<Node> dirty = tester.nodeRepository().getNodes(Node.State.dirty); + assertEquals(0, tester.nodeRepository().nodes().getNodes(Node.State.inactive).size()); + List<Node> dirty = tester.nodeRepository().nodes().getNodes(Node.State.dirty); assertEquals(1, dirty.size()); assertFalse(dirty.get(0).allocation().isPresent()); @@ -206,7 +206,7 @@ public class InactiveAndFailedExpirerTest { tester.patchNodes(inactiveNodes, (node) -> node.withWantToRetire(true, true, Agent.system, tester.clock().instant())); tester.advanceTime(Duration.ofMinutes(11)); new InactiveExpirer(tester.nodeRepository(), Duration.ofMinutes(10), new TestMetric()).run(); - assertEquals(2, tester.nodeRepository().getNodes(Node.State.parked).size()); + assertEquals(2, tester.nodeRepository().nodes().getNodes(Node.State.parked).size()); } } |