getNode(...) -> node(...)

24 files changed, 133 insertions, 135 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
index a881bde2a33..45173650d60 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MemoryMetricsDb.java
@@ -75,7 +75,7 @@ public class MemoryMetricsDb implements MetricsDb {
     private void add(String hostname, MetricSnapshot snapshot) {
         NodeTimeseries timeseries = db.get(hostname);
         if (timeseries == null) { // new node
-            Optional<Node> node = nodeRepository.nodes().getNode(hostname);
+            Optional<Node> node = nodeRepository.nodes().node(hostname);
             if (node.isEmpty()) return;
             if (node.get().allocation().isEmpty()) return;
             timeseries = new NodeTimeseries(hostname, new ArrayList<>());
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
index 47712847754..11292f9aa60 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
@@ -185,7 +185,7 @@ class MaintenanceDeployment implements Closeable {
                     markWantToRetire(node, false, agent, nodeRepository); // Necessary if this failed, no-op otherwise
 
                     // Immediately clean up if we reserved the node but could not activate or reserved a node on the wrong host
-                    expectedNewNode.flatMap(node -> nodeRepository.nodes().getNode(node.hostname(), Node.State.reserved))
+                    expectedNewNode.flatMap(node -> nodeRepository.nodes().node(node.hostname(), Node.State.reserved))
                                    .ifPresent(node -> nodeRepository.nodes().deallocate(node, agent, "Expired by " + agent));
                 }
             }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
index 54fe93062d6..ba884ced630 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
@@ -30,7 +30,6 @@ import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.counting;
 
 /**
  * Maintains information in the node repo about when this node last responded to ping
@@ -133,7 +132,7 @@ public class NodeFailer extends NodeRepositoryMaintainer {
             if (expectConfigRequests(node) && ! hasNodeRequestedConfigAfter(node, oldestAcceptableRequestTime)) {
                 nodesByFailureReason.put(node, "Not receiving config requests from node");
             } else {
-                Node hostNode = node.parentHostname().flatMap(parent -> nodeRepository().nodes().getNode(parent)).orElse(node);
+                Node hostNode = node.parentHostname().flatMap(parent -> nodeRepository().nodes().node(parent)).orElse(node);
                 List<String> failureReports = reasonsToFailParentHost(hostNode);
                 if (failureReports.size() > 0) {
                     if (hostNode.equals(node)) {
@@ -158,7 +157,7 @@ public class NodeFailer extends NodeRepositoryMaintainer {
                     nodesByFailureReason.put(node, "Node has been down longer than " + downTimeLimit);
             }
             else if (hostSuspended(node, activeNodes)) {
-                Node hostNode = node.parentHostname().flatMap(parent -> nodeRepository().nodes().getNode(parent)).orElse(node);
+                Node hostNode = node.parentHostname().flatMap(parent -> nodeRepository().nodes().node(parent)).orElse(node);
                 if (hostNode.type().isHost()) {
                     List<String> failureReports = reasonsToFailParentHost(hostNode);
                     if (failureReports.size() > 0) {
@@ -184,7 +183,7 @@ public class NodeFailer extends NodeRepositoryMaintainer {
 
     /** Returns whether node has any kind of hardware issue */
     static boolean hasHardwareIssue(Node node, NodeRepository nodeRepository) {
-        Node hostNode = node.parentHostname().flatMap(parent -> nodeRepository.nodes().getNode(parent)).orElse(node);
+        Node hostNode = node.parentHostname().flatMap(parent -> nodeRepository.nodes().node(parent)).orElse(node);
         return reasonsToFailParentHost(hostNode).size() > 0;
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeHealthTracker.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeHealthTracker.java
index e9dc961ce39..2950de285b9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeHealthTracker.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeHealthTracker.java
@@ -116,7 +116,7 @@ public class NodeHealthTracker extends NodeRepositoryMaintainer {
 
     /** Get node by given hostname and application. The applicationLock must be held when calling this */
     private Optional<Node> getNode(String hostname, ApplicationId application, @SuppressWarnings("unused") Mutex applicationLock) {
-        return nodeRepository().nodes().getNode(hostname, Node.State.active)
+        return nodeRepository().nodes().node(hostname, Node.State.active)
                                .filter(node -> node.allocation().isPresent())
                                .filter(node -> node.allocation().get().owner().equals(application));
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java
index debc1484e58..ca580753fc8 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java
@@ -165,7 +165,7 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer {
         try (MaintenanceDeployment deployment = new MaintenanceDeployment(application, deployer, metric, nodeRepository())) {
             if ( ! deployment.isValid()) return; // this will be done at another config server
 
-            Optional<Node> nodeWithWantToRetire = nodeRepository().nodes().getNode(nodeToRetire.get().hostname())
+            Optional<Node> nodeWithWantToRetire = nodeRepository().nodes().node(nodeToRetire.get().hostname())
                     .map(node -> node.withWantToRetire(true, Agent.SpareCapacityMaintainer, nodeRepository().clock().instant()));
             if (nodeWithWantToRetire.isEmpty()) return;
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
index 78893106c22..2dfd23b8680 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
@@ -70,7 +70,7 @@ public class Nodes {
      * @param inState the states the node may be in. If no states are given, it will be returned from any state
      * @return the node, or empty if it was not found in any of the given states
      */
-    public Optional<Node> getNode(String hostname, Node.State... inState) {
+    public Optional<Node> node(String hostname, Node.State... inState) {
         return db.readNode(hostname, inState);
     }
 
@@ -121,7 +121,7 @@ public class Nodes {
                 illegal("Cannot add " + node + ": This is not a docker node");
             if (node.allocation().isEmpty())
                 illegal("Cannot add " + node + ": Docker containers needs to be allocated");
-            Optional<Node> existing = getNode(node.hostname());
+            Optional<Node> existing = node(node.hostname());
             if (existing.isPresent())
                 illegal("Cannot add " + node + ": A node with this name already exists (" +
                         existing.get() + ", " + existing.get().history() + "). Node to be added: " +
@@ -148,7 +148,7 @@ public class Nodes {
                         illegal("Cannot add nodes: " + node + " is duplicated in the argument list");
                 }
 
-                Optional<Node> existing = getNode(node.hostname());
+                Optional<Node> existing = node(node.hostname());
                 if (existing.isPresent()) {
                     if (existing.get().state() != Node.State.deprovisioned)
                         illegal("Cannot add " + node + ": A node with this name already exists");
@@ -186,7 +186,7 @@ public class Nodes {
     }
 
     public Node setReady(String hostname, Agent agent, String reason) {
-        Node nodeToReady = getNode(hostname).orElseThrow(() ->
+        Node nodeToReady = node(hostname).orElseThrow(() ->
                                                                  new NoSuchNodeException("Could not move " + hostname + " to ready: Node not found"));
 
         if (nodeToReady.state() == Node.State.ready) return nodeToReady;
@@ -238,7 +238,7 @@ public class Nodes {
     }
 
     public List<Node> deallocateRecursively(String hostname, Agent agent, String reason) {
-        Node nodeToDirty = getNode(hostname).orElseThrow(() ->
+        Node nodeToDirty = node(hostname).orElseThrow(() ->
                                                                  new IllegalArgumentException("Could not deallocate " + hostname + ": Node not found"));
 
         List<Node> nodesToDirty =
@@ -351,7 +351,7 @@ public class Nodes {
      * Moves a host to breakfixed state, removing any children.
      */
     public List<Node> breakfixRecursively(String hostname, Agent agent, String reason) {
-        Node node = getNode(hostname).orElseThrow(() ->
+        Node node = node(hostname).orElseThrow(() ->
                                                           new NoSuchNodeException("Could not breakfix " + hostname + ": Node not found"));
 
         try (Mutex lock = lockUnallocated()) {
@@ -380,7 +380,7 @@ public class Nodes {
 
     private Node move(String hostname, boolean keepAllocation, Node.State toState, Agent agent, Optional<String> reason,
                       NestedTransaction transaction) {
-        Node node = getNode(hostname).orElseThrow(() ->
+        Node node = node(hostname).orElseThrow(() ->
                                                           new NoSuchNodeException("Could not move " + hostname + " to " + toState + ": Node not found"));
 
         if (!keepAllocation && node.allocation().isPresent()) {
@@ -419,7 +419,7 @@ public class Nodes {
      * containers this will remove the node from node repository, otherwise the node will be moved to state ready.
      */
     public Node markNodeAvailableForNewAllocation(String hostname, Agent agent, String reason) {
-        Node node = getNode(hostname).orElseThrow(() -> new NotFoundException("No node with hostname '" + hostname + "'"));
+        Node node = node(hostname).orElseThrow(() -> new NotFoundException("No node with hostname '" + hostname + "'"));
         if (node.flavor().getType() == Flavor.Type.DOCKER_CONTAINER && node.type() == NodeType.tenant) {
             if (node.state() != Node.State.dirty)
                 illegal("Cannot make " + node  + " available for new allocation as it is not in state [dirty]");
@@ -428,7 +428,7 @@ public class Nodes {
 
         if (node.state() == Node.State.ready) return node;
 
-        Node parentHost = node.parentHostname().flatMap(this::getNode).orElse(node);
+        Node parentHost = node.parentHostname().flatMap(this::node).orElse(node);
         List<String> failureReasons = NodeFailer.reasonsToFailParentHost(parentHost);
         if ( ! failureReasons.isEmpty())
             illegal(node + " cannot be readied because it has hard failures: " + failureReasons);
@@ -442,7 +442,7 @@ public class Nodes {
      * @return a List of all the nodes that have been removed or (for hosts) deprovisioned
      */
     public List<Node> removeRecursively(String hostname) {
-        Node node = getNode(hostname).orElseThrow(() -> new NotFoundException("No node with hostname '" + hostname + "'"));
+        Node node = node(hostname).orElseThrow(() -> new NotFoundException("No node with hostname '" + hostname + "'"));
         return removeRecursively(node, false);
     }
 
@@ -670,9 +670,9 @@ public class Nodes {
             Mutex lockToClose = lock(staleNode);
             try {
                 // As an optimization we first try finding the node in the same state
-                Optional<Node> freshNode = getNode(staleNode.hostname(), staleNode.state());
+                Optional<Node> freshNode = node(staleNode.hostname(), staleNode.state());
                 if (freshNode.isEmpty()) {
-                    freshNode = getNode(staleNode.hostname());
+                    freshNode = node(staleNode.hostname());
                     if (freshNode.isEmpty()) {
                         return Optional.empty();
                     }
@@ -698,7 +698,7 @@ public class Nodes {
 
     /** Returns the unallocated/application lock, and the node acquired under that lock. */
     public Optional<NodeMutex> lockAndGet(String hostname) {
-        return getNode(hostname).flatMap(this::lockAndGet);
+        return node(hostname).flatMap(this::lockAndGet);
     }
 
     /** Returns the unallocated/application lock, and the node acquired under that lock. */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java
index cad9faacf20..3c936e4e6ba 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java
@@ -126,7 +126,7 @@ class Activator {
     private void unreserveParentsOf(List<Node> nodes) {
         for (Node node : nodes) {
             if ( node.parentHostname().isEmpty()) continue;
-            Optional<Node> parentNode = nodeRepository.nodes().getNode(node.parentHostname().get());
+            Optional<Node> parentNode = nodeRepository.nodes().node(node.parentHostname().get());
             if (parentNode.isEmpty()) continue;
             if (parentNode.get().reservedTo().isEmpty()) continue;
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeAclResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeAclResponse.java
index 708a2f73ee6..811afc77cef 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeAclResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeAclResponse.java
@@ -39,7 +39,7 @@ public class NodeAclResponse extends HttpResponse {
     }
 
     private void toSlime(String hostname, Cursor object) {
-        Node node = nodeRepository.nodes().getNode(hostname)
+        Node node = nodeRepository.nodes().node(hostname)
                 .orElseThrow(() -> new NotFoundException("No node with hostname '" + hostname + "'"));
 
         List<NodeAcl> acls = aclsForChildren ? nodeRepository.getChildAcls(node) :
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
index 6e30ebb7ab3..1175736e517 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
@@ -127,7 +127,7 @@ class NodesResponse extends HttpResponse {
     }
 
     private void nodeToSlime(String hostname, Cursor object) {
-        Node node = nodeRepository.nodes().getNode(hostname).orElseThrow(() ->
+        Node node = nodeRepository.nodes().node(hostname).orElseThrow(() ->
                 new NotFoundException("No node with hostname '" + hostname + "'"));
         toSlime(node, true, object);
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
index b872e2cd9cb..56b46c106ee 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
@@ -223,7 +223,7 @@ public class NodesV2ApiHandler extends LoggingRequestHandler {
 
     private Node nodeFromRequest(HttpRequest request) {
         String hostname = lastElement(request.getUri().getPath());
-        return nodeRepository.nodes().getNode(hostname).orElseThrow(() ->
+        return nodeRepository.nodes().node(hostname).orElseThrow(() ->
                 new NotFoundException("No node found with hostname " + hostname));
     }
 
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 78835912606..c74ecaccd06 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
@@ -75,13 +75,13 @@ public class NodeRepositoryTest {
         tester.setNodeState("cfg1", Node.State.dirty);
 
         tester.nodeRepository().nodes().markNodeAvailableForNewAllocation("host1", Agent.system, getClass().getSimpleName());
-        assertEquals(Node.State.ready, tester.nodeRepository().nodes().getNode("host1").get().state());
+        assertEquals(Node.State.ready, tester.nodeRepository().nodes().node("host1").get().state());
 
         tester.nodeRepository().nodes().markNodeAvailableForNewAllocation("host2", Agent.system, getClass().getSimpleName());
-        assertFalse(tester.nodeRepository().nodes().getNode("host2").isPresent());
+        assertFalse(tester.nodeRepository().nodes().node("host2").isPresent());
 
         tester.nodeRepository().nodes().markNodeAvailableForNewAllocation("cfg1", Agent.system, getClass().getSimpleName());
-        assertEquals(Node.State.ready, tester.nodeRepository().nodes().getNode("cfg1").get().state());
+        assertEquals(Node.State.ready, tester.nodeRepository().nodes().node("cfg1").get().state());
     }
 
     @Test
@@ -92,14 +92,14 @@ public class NodeRepositoryTest {
         tester.setNodeState("host1", Node.State.dirty);
         tester.setNodeState("host2", Node.State.dirty);
 
-        Node node2 = tester.nodeRepository().nodes().getNode("host2").orElseThrow();
+        Node node2 = tester.nodeRepository().nodes().node("host2").orElseThrow();
         var reportsBuilder = new Reports.Builder(node2.reports());
         reportsBuilder.setReport(Report.basicReport("reportId", Report.Type.HARD_FAIL, Instant.EPOCH, "hardware failure"));
         node2 = node2.with(reportsBuilder.build());
         tester.nodeRepository().nodes().write(node2, () -> {});
 
         tester.nodeRepository().nodes().markNodeAvailableForNewAllocation("host1", Agent.system, getClass().getSimpleName());
-        assertEquals(Node.State.ready, tester.nodeRepository().nodes().getNode("host1").get().state());
+        assertEquals(Node.State.ready, tester.nodeRepository().nodes().node("host1").get().state());
 
         try {
             tester.nodeRepository().nodes().markNodeAvailableForNewAllocation("host2", Agent.system, getClass().getSimpleName());
@@ -133,7 +133,7 @@ public class NodeRepositoryTest {
         // Should be OK to delete host2 as both host2 and its only child, node20, are in state provisioned
         tester.nodeRepository().nodes().removeRecursively("host2");
         assertEquals(5, tester.nodeRepository().nodes().list().size());
-        assertEquals(Node.State.deprovisioned, tester.nodeRepository().nodes().getNode("host2").get().state());
+        assertEquals(Node.State.deprovisioned, tester.nodeRepository().nodes().node("host2").get().state());
 
         // Now node10 is in provisioned, set node11 to failed and node12 to ready, and it should be OK to delete host1
         tester.nodeRepository().nodes().fail("node11", Agent.system, getClass().getSimpleName());
@@ -141,8 +141,8 @@ public class NodeRepositoryTest {
         tester.nodeRepository().nodes().removeRecursively("node12"); // Remove one of the children first instead
         assertEquals(4, tester.nodeRepository().nodes().list().size());
         tester.nodeRepository().nodes().removeRecursively("host1");
-        assertEquals(Node.State.deprovisioned, tester.nodeRepository().nodes().getNode("host1").get().state());
-        assertEquals(IP.Config.EMPTY.primary(), tester.nodeRepository().nodes().getNode("host1").get().ipConfig().primary());
+        assertEquals(Node.State.deprovisioned, tester.nodeRepository().nodes().node("host1").get().state());
+        assertEquals(IP.Config.EMPTY.primary(), tester.nodeRepository().nodes().node("host1").get().ipConfig().primary());
     }
 
     @Test
@@ -179,7 +179,7 @@ public class NodeRepositoryTest {
         tester.clock().advance(Duration.ofSeconds(1));
         tester.addHost("id1", "host1", "default", NodeType.host);
         tester.addHost("id2", "host2", "default", NodeType.host);
-        assertFalse(tester.nodeRepository().nodes().getNode("host1").get().history().hasEventAfter(History.Event.Type.deprovisioned, testStart));
+        assertFalse(tester.nodeRepository().nodes().node("host1").get().history().hasEventAfter(History.Event.Type.deprovisioned, testStart));
 
         // Set host 1 properties and deprovision it
         try (var lock = tester.nodeRepository().nodes().lockAndGetRequired("host1")) {
@@ -192,16 +192,16 @@ public class NodeRepositoryTest {
         tester.nodeRepository().nodes().removeRecursively("host1");
 
         // Host 1 is deprovisioned and unwanted properties are cleared
-        Node host1 = tester.nodeRepository().nodes().getNode("host1").get();
+        Node host1 = tester.nodeRepository().nodes().node("host1").get();
         assertEquals(Node.State.deprovisioned, host1.state());
         assertTrue(host1.history().hasEventAfter(History.Event.Type.deprovisioned, testStart));
 
         // Adding it again preserves some information from the deprovisioned host and removes it
         tester.addHost("id2", "host1", "default", NodeType.host);
-        host1 = tester.nodeRepository().nodes().getNode("host1").get();
+        host1 = tester.nodeRepository().nodes().node("host1").get();
         assertEquals("This is the newly added node", "id2", host1.id());
         assertFalse("The old 'host1' is removed",
-                    tester.nodeRepository().nodes().getNode("host1", Node.State.deprovisioned).isPresent());
+                    tester.nodeRepository().nodes().node("host1", Node.State.deprovisioned).isPresent());
         assertFalse("Not transferred from deprovisioned host", host1.status().wantToRetire());
         assertFalse("Not transferred from deprovisioned host", host1.status().wantToDeprovision());
         assertTrue("Transferred from deprovisioned host", host1.history().hasEventAfter(History.Event.Type.deprovisioned, testStart));
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 e2db91dbae4..195a27f21a3 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
@@ -79,7 +79,7 @@ public class NodeRepositoryTester {
      * of valid state transitions
      */
     public void setNodeState(String hostname, Node.State state) {
-        Node node = nodeRepository.nodes().getNode(hostname).orElseThrow(RuntimeException::new);
+        Node node = nodeRepository.nodes().node(hostname).orElseThrow(RuntimeException::new);
         nodeRepository.database().writeTo(state, node, Agent.system, Optional.empty());
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
index 8a7f439304d..0581f9f84b3 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
@@ -96,9 +96,9 @@ class AutoscalingTester {
     }
 
     public void makeReady(String hostname) {
-        Node node = nodeRepository().nodes().getNode(hostname).get();
+        Node node = nodeRepository().nodes().node(hostname).get();
         provisioningTester.patchNode(node, (n) -> n.with(new IP.Config(Set.of("::" + 0 + ":0"), Set.of())));
-        Node host = nodeRepository().nodes().getNode(node.parentHostname().get()).get();
+        Node host = nodeRepository().nodes().node(node.parentHostname().get()).get();
         host = host.with(new IP.Config(Set.of("::" + 0 + ":0"), Set.of("::" + 0 + ":2")));
         if (host.state() == Node.State.provisioned)
             nodeRepository().nodes().setReady(List.of(host), Agent.system, getClass().getSimpleName());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
index 39d49a319ac..26370709fa3 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainerTest.java
@@ -63,9 +63,9 @@ public class DynamicProvisioningMaintainerTest {
         var tester = new DynamicProvisioningTester().addInitialNodes();
         tester.hostProvisioner.with(Behaviour.failDeprovisioning); // To avoid deleting excess nodes
 
-        Node host3 = tester.nodeRepository.nodes().getNode("host3").orElseThrow();
-        Node host4 = tester.nodeRepository.nodes().getNode("host4").orElseThrow();
-        Node host41 = tester.nodeRepository.nodes().getNode("host4-1").orElseThrow();
+        Node host3 = tester.nodeRepository.nodes().node("host3").orElseThrow();
+        Node host4 = tester.nodeRepository.nodes().node("host4").orElseThrow();
+        Node host41 = tester.nodeRepository.nodes().node("host4-1").orElseThrow();
         assertTrue("No IP addresses assigned",
                    Stream.of(host3, host4, host41).map(node -> node.ipConfig().primary()).allMatch(Set::isEmpty));
 
@@ -74,9 +74,9 @@ public class DynamicProvisioningMaintainerTest {
         Node host41new = host41.with(host41.ipConfig().withPrimary(Set.of("::4:1", "::4:2")));
 
         tester.maintainer.maintain();
-        assertEquals(host3new, tester.nodeRepository.nodes().getNode("host3").get());
-        assertEquals(host4new, tester.nodeRepository.nodes().getNode("host4").get());
-        assertEquals(host41new, tester.nodeRepository.nodes().getNode("host4-1").get());
+        assertEquals(host3new, tester.nodeRepository.nodes().node("host3").get());
+        assertEquals(host4new, tester.nodeRepository.nodes().node("host4").get());
+        assertEquals(host41new, tester.nodeRepository.nodes().node("host4-1").get());
     }
 
     @Test
@@ -95,23 +95,23 @@ public class DynamicProvisioningMaintainerTest {
     @Test
     public void finds_nodes_that_need_deprovisioning_without_pre_provisioning() {
         var tester = new DynamicProvisioningTester().addInitialNodes();
-        assertTrue(tester.nodeRepository.nodes().getNode("host2").isPresent());
-        assertTrue(tester.nodeRepository.nodes().getNode("host3").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("host2").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("host3").isPresent());
 
         tester.maintainer.maintain();
-        assertTrue(tester.nodeRepository.nodes().getNode("host2").isEmpty());
-        assertTrue(tester.nodeRepository.nodes().getNode("host3").isEmpty());
+        assertTrue(tester.nodeRepository.nodes().node("host2").isEmpty());
+        assertTrue(tester.nodeRepository.nodes().node("host3").isEmpty());
     }
 
     @Test
     public void does_not_deprovision_when_preprovisioning_enabled() {
         var tester = new DynamicProvisioningTester().addInitialNodes();
         tester.flagSource.withListFlag(PermanentFlags.PREPROVISION_CAPACITY.id(), List.of(new ClusterCapacity(1, 1, 3, 2, 1.0)), ClusterCapacity.class);
-        Optional<Node> failedHost = tester.nodeRepository.nodes().getNode("host2");
+        Optional<Node> failedHost = tester.nodeRepository.nodes().node("host2");
         assertTrue(failedHost.isPresent());
 
         tester.maintainer.maintain();
-        assertTrue("Failed host is deprovisioned", tester.nodeRepository.nodes().getNode(failedHost.get().hostname()).isEmpty());
+        assertTrue("Failed host is deprovisioned", tester.nodeRepository.nodes().node(failedHost.get().hostname()).isEmpty());
         assertEquals(1, tester.hostProvisioner.deprovisionedHosts);
     }
 
@@ -125,11 +125,11 @@ public class DynamicProvisioningMaintainerTest {
 
         assertEquals(0, tester.hostProvisioner.provisionedHosts.size());
         assertEquals(11, tester.nodeRepository.nodes().list().size());
-        assertTrue(tester.nodeRepository.nodes().getNode("host2").isPresent());
-        assertTrue(tester.nodeRepository.nodes().getNode("host2-1").isPresent());
-        assertTrue(tester.nodeRepository.nodes().getNode("host3").isPresent());
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname100").isEmpty());
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname101").isEmpty());
+        assertTrue(tester.nodeRepository.nodes().node("host2").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("host2-1").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("host3").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("hostname100").isEmpty());
+        assertTrue(tester.nodeRepository.nodes().node("hostname101").isEmpty());
 
         tester.maintainer.maintain();
 
@@ -137,11 +137,11 @@ public class DynamicProvisioningMaintainerTest {
         assertEquals(2, tester.provisionedHostsMatching(new NodeResources(48, 128, 1000, 10)));
         NodeList nodesAfter = tester.nodeRepository.nodes().list();
         assertEquals(11, nodesAfter.size());  // 2 removed, 2 added
-        assertTrue("Failed host 'host2' is deprovisioned", tester.nodeRepository.nodes().getNode("host2").isEmpty());
-        assertTrue("Node on deprovisioned host removed", tester.nodeRepository.nodes().getNode("host2-1").isEmpty());
-        assertTrue("Host satisfying 16-24-100-1 is kept", tester.nodeRepository.nodes().getNode("host3").isPresent());
-        assertTrue("New 48-128-1000-10 host added", tester.nodeRepository.nodes().getNode("hostname100").isPresent());
-        assertTrue("New 48-128-1000-10 host added", tester.nodeRepository.nodes().getNode("hostname101").isPresent());
+        assertTrue("Failed host 'host2' is deprovisioned", tester.nodeRepository.nodes().node("host2").isEmpty());
+        assertTrue("Node on deprovisioned host removed", tester.nodeRepository.nodes().node("host2-1").isEmpty());
+        assertTrue("Host satisfying 16-24-100-1 is kept", tester.nodeRepository.nodes().node("host3").isPresent());
+        assertTrue("New 48-128-1000-10 host added", tester.nodeRepository.nodes().node("hostname100").isPresent());
+        assertTrue("New 48-128-1000-10 host added", tester.nodeRepository.nodes().node("hostname101").isPresent());
     }
 
     @Test
@@ -156,10 +156,10 @@ public class DynamicProvisioningMaintainerTest {
 
         assertEquals(0, tester.hostProvisioner.provisionedHosts.size());
         assertEquals(11, tester.nodeRepository.nodes().list().size());
-        assertTrue(tester.nodeRepository.nodes().getNode("host2").isPresent());
-        assertTrue(tester.nodeRepository.nodes().getNode("host2-1").isPresent());
-        assertTrue(tester.nodeRepository.nodes().getNode("host3").isPresent());
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname100").isEmpty());
+        assertTrue(tester.nodeRepository.nodes().node("host2").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("host2-1").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("host3").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("hostname100").isEmpty());
 
         // The first cluster will be allocated to host3 and a new host hostname100.
         // hostname100 will be a large shared host specified above.
@@ -196,9 +196,9 @@ public class DynamicProvisioningMaintainerTest {
         assertEquals(2, tester.hostProvisioner.provisionedHosts.size());
         assertEquals(2, tester.provisionedHostsMatching(new NodeResources(48, 128, 1000, 10)));
         assertEquals(10, tester.nodeRepository.nodes().list().size());  // 3 removed, 2 added
-        assertTrue("preprovision capacity is prefered on shared hosts", tester.nodeRepository.nodes().getNode("host3").isEmpty());
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname100").isPresent());
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname101").isPresent());
+        assertTrue("preprovision capacity is prefered on shared hosts", tester.nodeRepository.nodes().node("host3").isEmpty());
+        assertTrue(tester.nodeRepository.nodes().node("hostname100").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("hostname101").isPresent());
 
         // If the preprovision capacity is reduced, we should see shared hosts deprovisioned.
 
@@ -212,12 +212,12 @@ public class DynamicProvisioningMaintainerTest {
                 1, tester.hostProvisioner.provisionedHosts.size());
         assertEquals(1, tester.provisionedHostsMatching(new NodeResources(48, 128, 1000, 10)));
         assertEquals(9, tester.nodeRepository.nodes().list().size());  // 4 removed, 2 added
-        if (tester.nodeRepository.nodes().getNode("hostname100").isPresent()) {
+        if (tester.nodeRepository.nodes().node("hostname100").isPresent()) {
             assertTrue("hostname101 is superfluous and should have been deprovisioned",
-                    tester.nodeRepository.nodes().getNode("hostname101").isEmpty());
+                    tester.nodeRepository.nodes().node("hostname101").isEmpty());
         } else {
             assertTrue("hostname101 is required for preprovision capacity",
-                    tester.nodeRepository.nodes().getNode("hostname101").isPresent());
+                    tester.nodeRepository.nodes().node("hostname101").isPresent());
         }
 
     }
@@ -226,10 +226,10 @@ public class DynamicProvisioningMaintainerTest {
         assertEquals(1, tester.hostProvisioner.provisionedHosts.size());
         assertEquals(1, tester.provisionedHostsMatching(new NodeResources(48, 128, 1000, 10)));
         assertEquals(10, tester.nodeRepository.nodes().list().size());  // 2 removed, 1 added
-        assertTrue("Failed host 'host2' is deprovisioned", tester.nodeRepository.nodes().getNode("host2").isEmpty());
-        assertTrue("Node on deprovisioned host removed", tester.nodeRepository.nodes().getNode("host2-1").isEmpty());
-        assertTrue("One 1-30-20-3 node fits on host3", tester.nodeRepository.nodes().getNode("host3").isPresent());
-        assertTrue("New 48-128-1000-10 host added", tester.nodeRepository.nodes().getNode("hostname100").isPresent());
+        assertTrue("Failed host 'host2' is deprovisioned", tester.nodeRepository.nodes().node("host2").isEmpty());
+        assertTrue("Node on deprovisioned host removed", tester.nodeRepository.nodes().node("host2-1").isEmpty());
+        assertTrue("One 1-30-20-3 node fits on host3", tester.nodeRepository.nodes().node("host3").isPresent());
+        assertTrue("New 48-128-1000-10 host added", tester.nodeRepository.nodes().node("hostname100").isPresent());
     }
 
     @Test
@@ -283,7 +283,7 @@ public class DynamicProvisioningMaintainerTest {
         tester.hostProvisioner.with(Behaviour.failDeprovisioning);
 
         tester.maintainer.maintain();
-        assertTrue(tester.nodeRepository.nodes().getNode(host2.hostname()).isPresent());
+        assertTrue(tester.nodeRepository.nodes().node(host2.hostname()).isPresent());
     }
 
     @Test
@@ -339,10 +339,10 @@ public class DynamicProvisioningMaintainerTest {
                 List.of(new ClusterCapacity(3, 0, 0, 0, 0.0)),
                 ClusterCapacity.class);
         assertEquals(0, tester.provisionedHostsMatching(sharedHostNodeResources));
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname102").isEmpty());
+        assertTrue(tester.nodeRepository.nodes().node("hostname102").isEmpty());
         tester.maintainer.maintain();
         assertEquals(1, tester.provisionedHostsMatching(sharedHostNodeResources));
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname102").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("hostname102").isPresent());
 
         // Next maintenance run does nothing
         tester.assertNodesUnchanged();
@@ -367,14 +367,14 @@ public class DynamicProvisioningMaintainerTest {
                 ClusterCapacity.class);
 
         assertEquals(1, tester.provisionedHostsMatching(sharedHostNodeResources));
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname102").isPresent());
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname103").isEmpty());
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname104").isEmpty());
+        assertTrue(tester.nodeRepository.nodes().node("hostname102").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("hostname103").isEmpty());
+        assertTrue(tester.nodeRepository.nodes().node("hostname104").isEmpty());
         tester.maintainer.maintain();
         assertEquals(3, tester.provisionedHostsMatching(sharedHostNodeResources));
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname102").isPresent());
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname103").isPresent());
-        assertTrue(tester.nodeRepository.nodes().getNode("hostname104").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("hostname102").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("hostname103").isPresent());
+        assertTrue(tester.nodeRepository.nodes().node("hostname104").isPresent());
     }
 
     @Test
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
index 6a10b930871..2191963de8a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
@@ -268,7 +268,7 @@ public class FailedExpirerTest {
         }
 
         public Node get(String hostname) {
-            return nodeRepository.nodes().getNode(hostname)
+            return nodeRepository.nodes().node(hostname)
                                  .orElseThrow(() -> new IllegalArgumentException("No such node: " + hostname));
         }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
index 56f06b59138..16afcb85020 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
@@ -97,11 +97,11 @@ public class NodeFailerTest {
                 .map(Node::state).collect(Collectors.toSet());
         assertEquals(Set.of(Node.State.failed), childStates2Iter);
         // The host itself is still active as it too must be allowed to suspend
-        assertEquals(Node.State.active, tester.nodeRepository.nodes().getNode(hostWithHwFailure).get().state());
+        assertEquals(Node.State.active, tester.nodeRepository.nodes().node(hostWithHwFailure).get().state());
 
         tester.suspend(hostWithHwFailure);
         tester.runMaintainers();
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(hostWithHwFailure).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(hostWithHwFailure).get().state());
         assertEquals(4, tester.nodeRepository.nodes().list(Node.State.failed).size());
     }
 
@@ -109,7 +109,7 @@ public class NodeFailerTest {
     public void hw_fail_only_if_whole_host_is_suspended() {
         NodeFailTester tester = NodeFailTester.withTwoApplicationsOnDocker(6);
         String hostWithFailureReports = selectFirstParentHostWithNActiveNodesExcept(tester.nodeRepository, 2);
-        assertEquals(Node.State.active, tester.nodeRepository.nodes().getNode(hostWithFailureReports).get().state());
+        assertEquals(Node.State.active, tester.nodeRepository.nodes().node(hostWithFailureReports).get().state());
 
         // The host has 2 nodes in active and 1 ready
         Map<Node.State, List<String>> hostnamesByState = tester.nodeRepository.nodes().list().childrenOf(hostWithFailureReports).asList().stream()
@@ -132,40 +132,40 @@ public class NodeFailerTest {
         // The ready node will be failed, but neither the host nor the 2 active nodes since they have not been suspended
         tester.allNodesMakeAConfigRequestExcept();
         tester.runMaintainers();
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(readyChild).get().state());
-        assertEquals(Node.State.active, tester.nodeRepository.nodes().getNode(hostWithFailureReports).get().state());
-        assertEquals(Node.State.active, tester.nodeRepository.nodes().getNode(activeChild1).get().state());
-        assertEquals(Node.State.active, tester.nodeRepository.nodes().getNode(activeChild2).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(readyChild).get().state());
+        assertEquals(Node.State.active, tester.nodeRepository.nodes().node(hostWithFailureReports).get().state());
+        assertEquals(Node.State.active, tester.nodeRepository.nodes().node(activeChild1).get().state());
+        assertEquals(Node.State.active, tester.nodeRepository.nodes().node(activeChild2).get().state());
 
         // Suspending the host will not fail any more since none of the children are suspened
         tester.suspend(hostWithFailureReports);
         tester.clock.advance(Duration.ofHours(25));
         tester.allNodesMakeAConfigRequestExcept();
         tester.runMaintainers();
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(readyChild).get().state());
-        assertEquals(Node.State.active, tester.nodeRepository.nodes().getNode(hostWithFailureReports).get().state());
-        assertEquals(Node.State.active, tester.nodeRepository.nodes().getNode(activeChild1).get().state());
-        assertEquals(Node.State.active, tester.nodeRepository.nodes().getNode(activeChild2).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(readyChild).get().state());
+        assertEquals(Node.State.active, tester.nodeRepository.nodes().node(hostWithFailureReports).get().state());
+        assertEquals(Node.State.active, tester.nodeRepository.nodes().node(activeChild1).get().state());
+        assertEquals(Node.State.active, tester.nodeRepository.nodes().node(activeChild2).get().state());
 
         // Suspending one child node will fail that out.
         tester.suspend(activeChild1);
         tester.clock.advance(Duration.ofHours(25));
         tester.allNodesMakeAConfigRequestExcept();
         tester.runMaintainers();
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(readyChild).get().state());
-        assertEquals(Node.State.active, tester.nodeRepository.nodes().getNode(hostWithFailureReports).get().state());
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(activeChild1).get().state());
-        assertEquals(Node.State.active, tester.nodeRepository.nodes().getNode(activeChild2).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(readyChild).get().state());
+        assertEquals(Node.State.active, tester.nodeRepository.nodes().node(hostWithFailureReports).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(activeChild1).get().state());
+        assertEquals(Node.State.active, tester.nodeRepository.nodes().node(activeChild2).get().state());
 
         // Suspending the second child node will fail that out and the host.
         tester.suspend(activeChild2);
         tester.clock.advance(Duration.ofHours(25));
         tester.allNodesMakeAConfigRequestExcept();
         tester.runMaintainers();
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(readyChild).get().state());
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(hostWithFailureReports).get().state());
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(activeChild1).get().state());
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(activeChild2).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(readyChild).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(hostWithFailureReports).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(activeChild1).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(activeChild2).get().state());
     }
 
     @Test
@@ -182,10 +182,10 @@ public class NodeFailerTest {
         tester.clock.advance(Duration.ofMinutes(65));
         tester.runMaintainers();
 
-        assertTrue(tester.nodeRepository.nodes().getNode(host_from_normal_app).get().isDown());
-        assertTrue(tester.nodeRepository.nodes().getNode(host_from_suspended_app).get().isDown());
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(host_from_normal_app).get().state());
-        assertEquals(Node.State.active, tester.nodeRepository.nodes().getNode(host_from_suspended_app).get().state());
+        assertTrue(tester.nodeRepository.nodes().node(host_from_normal_app).get().isDown());
+        assertTrue(tester.nodeRepository.nodes().node(host_from_suspended_app).get().isDown());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(host_from_normal_app).get().state());
+        assertEquals(Node.State.active, tester.nodeRepository.nodes().node(host_from_suspended_app).get().state());
     }
 
     @Test
@@ -233,8 +233,8 @@ public class NodeFailerTest {
         assertEquals(4, tester.nodeRepository.nodes().list(Node.State.ready).nodeType(NodeType.tenant).size());
         tester.runMaintainers();
         assertEquals(2, tester.nodeRepository.nodes().list(Node.State.ready).nodeType(NodeType.tenant).size());
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(readyFail1.hostname()).get().state());
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(readyFail2.hostname()).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(readyFail1.hostname()).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(readyFail2.hostname()).get().state());
 
         String downHost1 = tester.nodeRepository.nodes().list(NodeFailTester.app1, Node.State.active).asList().get(1).hostname();
         String downHost2 = tester.nodeRepository.nodes().list(NodeFailTester.app2, Node.State.active).asList().get(3).hostname();
@@ -324,7 +324,7 @@ public class NodeFailerTest {
         tester.allNodesMakeAConfigRequestExcept();
         tester.runMaintainers();
         assertEquals(1, tester.nodeRepository.nodes().list(Node.State.failed).nodeType(NodeType.tenant).size());
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(downNode).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(downNode).get().state());
 
         // Re-activate the node. It is still down, but should not be failed out until the grace period has passed again
         tester.nodeRepository.nodes().reactivate(downNode, Agent.system, getClass().getSimpleName());
@@ -337,7 +337,7 @@ public class NodeFailerTest {
         tester.allNodesMakeAConfigRequestExcept();
         tester.runMaintainers();
         assertEquals(1, tester.nodeRepository.nodes().list(Node.State.failed).nodeType(NodeType.tenant).size());
-        assertEquals(Node.State.failed, tester.nodeRepository.nodes().getNode(downNode).get().state());
+        assertEquals(Node.State.failed, tester.nodeRepository.nodes().node(downNode).get().state());
     }
 
     @Test
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OsUpgradeActivatorTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OsUpgradeActivatorTest.java
index 36452e05bb6..3f0b94170f6 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OsUpgradeActivatorTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OsUpgradeActivatorTest.java
@@ -103,7 +103,7 @@ public class OsUpgradeActivatorTest {
     private Stream<Node> streamUpdatedNodes(List<Node> nodes) {
         Stream<Node> stream = Stream.empty();
         for (var node : nodes) {
-            stream = Stream.concat(stream, tester.nodeRepository().nodes().getNode(node.hostname()).stream());
+            stream = Stream.concat(stream, tester.nodeRepository().nodes().node(node.hostname()).stream());
         }
         return stream;
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java
index a1aa097e4cc..b2ac6788566 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RebalancerTest.java
@@ -184,7 +184,7 @@ public class RebalancerTest {
             return getNode(node.hostname()).get().allocation().get().membership().retired();
         }
 
-        Optional<Node> getNode(String hostname) { return tester.nodeRepository().nodes().getNode(hostname); }
+        Optional<Node> getNode(String hostname) { return tester.nodeRepository().nodes().node(hostname); }
 
         NodeList getNodes(Node.State nodeState) { return tester.nodeRepository().nodes().list(nodeState); }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
index c7a1610f75d..09e142b68a0 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
@@ -256,7 +256,7 @@ public class OsVersionsTest {
         tester.prepareAndActivateInfraApplication(infraApplication, nodeType);
         return nodes.stream()
                     .map(Node::hostname)
-                    .flatMap(hostname -> tester.nodeRepository().nodes().getNode(hostname).stream())
+                    .flatMap(hostname -> tester.nodeRepository().nodes().node(hostname).stream())
                     .collect(Collectors.toList());
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
index 39a206e2223..bd342df22f0 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
@@ -52,7 +52,7 @@ public class AclProvisioningTest {
 
         // Get trusted nodes for the first active node
         Node node = activeNodes.get(0);
-        List<Node> host = node.parentHostname().flatMap(tester.nodeRepository().nodes()::getNode).map(List::of).orElseGet(List::of);
+        List<Node> host = node.parentHostname().flatMap(tester.nodeRepository().nodes()::node).map(List::of).orElseGet(List::of);
         Supplier<NodeAcl> nodeAcls = () -> node.acl(tester.nodeRepository().nodes().list(), tester.nodeRepository().loadBalancers());
 
         // Trusted nodes are active nodes in same application, proxy nodes and config servers
@@ -94,7 +94,7 @@ public class AclProvisioningTest {
         NodeList tenantNodes = tester.nodeRepository().nodes().list().nodeType(NodeType.tenant);
 
         // Get trusted nodes for the first config server
-        Node node = tester.nodeRepository().nodes().getNode("cfg1")
+        Node node = tester.nodeRepository().nodes().node("cfg1")
                 .orElseThrow(() -> new RuntimeException("Failed to find cfg1"));
         NodeAcl nodeAcl = node.acl(tester.nodeRepository().nodes().list(), tester.nodeRepository().loadBalancers());
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
index 48a2d47c173..55ca2d7e55a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
@@ -434,13 +434,13 @@ public class DockerProvisioningTest {
 
     private void assertNodeParentReservation(List<Node> nodes, Optional<TenantName> reservation, ProvisioningTester tester) {
         for (Node node : nodes)
-            assertEquals(reservation, tester.nodeRepository().nodes().getNode(node.parentHostname().get()).get().reservedTo());
+            assertEquals(reservation, tester.nodeRepository().nodes().node(node.parentHostname().get()).get().reservedTo());
     }
 
     private void assertHostSpecParentReservation(List<HostSpec> hostSpecs, Optional<TenantName> reservation, ProvisioningTester tester) {
         for (HostSpec hostSpec : hostSpecs) {
-            Node node = tester.nodeRepository().nodes().getNode(hostSpec.hostname()).get();
-            assertEquals(reservation, tester.nodeRepository().nodes().getNode(node.parentHostname().get()).get().reservedTo());
+            Node node = tester.nodeRepository().nodes().node(hostSpec.hostname()).get();
+            assertEquals(reservation, tester.nodeRepository().nodes().node(node.parentHostname().get()).get().reservedTo());
         }
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java
index 596591ad599..124f7db569a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java
@@ -123,7 +123,7 @@ public class NodeTypeProvisioningTest {
             assertEquals(11, nodes.size());
 
             // Verify that wantToRetire has been propagated
-            assertTrue(tester.nodeRepository().nodes().getNode(nodeToRetire.hostname())
+            assertTrue(tester.nodeRepository().nodes().node(nodeToRetire.hostname())
                     .flatMap(Node::allocation)
                     .map(allocation -> allocation.membership().retired())
                     .orElseThrow(RuntimeException::new));
@@ -137,7 +137,7 @@ public class NodeTypeProvisioningTest {
             assertEquals(11, nodes.size());
 
             // Verify that the node is still marked as retired
-            assertTrue(tester.nodeRepository().nodes().getNode(nodeToRetire.hostname())
+            assertTrue(tester.nodeRepository().nodes().node(nodeToRetire.hostname())
                     .flatMap(Node::allocation)
                     .map(allocation -> allocation.membership().retired())
                     .orElseThrow(RuntimeException::new));
@@ -154,7 +154,7 @@ public class NodeTypeProvisioningTest {
             assertEquals(10, nodes.size());
 
             // Verify that the node is now inactive
-            assertEquals(Node.State.dirty, tester.nodeRepository().nodes().getNode(nodeToRetire.hostname())
+            assertEquals(Node.State.dirty, tester.nodeRepository().nodes().node(nodeToRetire.hostname())
                     .orElseThrow(RuntimeException::new).state());
         }
     }
@@ -233,7 +233,7 @@ public class NodeTypeProvisioningTest {
             assertEquals(10, nodes.size());
 
             // Verify the node we previously set to retire has finished retiring
-            assertEquals(Node.State.dirty, tester.nodeRepository().nodes().getNode(currentyRetiringHostname)
+            assertEquals(Node.State.dirty, tester.nodeRepository().nodes().node(currentyRetiringHostname)
                     .orElseThrow(RuntimeException::new).state());
 
             // Verify that a node is currently retiring
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
index 324f931be14..2b0541ce0c2 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
@@ -32,7 +32,6 @@ import com.yahoo.vespa.service.duper.InfraApplication;
 import org.junit.Test;
 
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -161,7 +160,7 @@ public class ProvisioningTest {
 
         HostSpec host1 = state1.container0.iterator().next();
         assertFalse(host1.version().isPresent());
-        Node node1 = tester.nodeRepository().nodes().getNode(host1.hostname()).get();
+        Node node1 = tester.nodeRepository().nodes().node(host1.hostname()).get();
         tester.nodeRepository().nodes().write(node1.with(node1.status().withVespaVersion(Version.fromString("1.2.3"))), () -> {});
 
         // redeploy
@@ -187,7 +186,7 @@ public class ProvisioningTest {
         tester.activate(application1, state1.allHosts);
 
         HostSpec host1 = state1.container0.iterator().next();
-        Node node1 = tester.nodeRepository().nodes().getNode(host1.hostname()).get();
+        Node node1 = tester.nodeRepository().nodes().node(host1.hostname()).get();
         DockerImage dockerImage = DockerImage.fromString(dockerImageRepo).withTag(Version.fromString("1.2.3"));
         tester.nodeRepository().nodes().write(node1.with(node1.status().withContainerImage(dockerImage)), () -> {});
 
@@ -196,7 +195,7 @@ public class ProvisioningTest {
         tester.activate(application1, state2.allHosts);
 
         host1 = state2.container0.iterator().next();
-        node1 = tester.nodeRepository().nodes().getNode(host1.hostname()).get();
+        node1 = tester.nodeRepository().nodes().node(host1.hostname()).get();
         assertEquals(dockerImage, node1.status().containerImage().get());
     }
 
@@ -318,7 +317,7 @@ public class ProvisioningTest {
         tester.activate(application1, state1.allHosts);
 
         tester.nodeRepository().nodes().list(application1)
-              .forEach(n -> assertEquals(large, tester.nodeRepository().nodes().getNode(n.parentHostname().get()).get().resources()));
+              .forEach(n -> assertEquals(large, tester.nodeRepository().nodes().node(n.parentHostname().get()).get().resources()));
     }
 
     @Test
@@ -785,7 +784,7 @@ public class ProvisioningTest {
         // Re-deploy application with 1 node less, the retired node should be on the spare host
         tester.deploy(application, spec, Capacity.from(new ClusterResources(5, 1, defaultResources)));
 
-        assertTrue(tester.nodeRepository().nodes().getNode(randomNode.hostname()).get().allocation().get().membership().retired());
+        assertTrue(tester.nodeRepository().nodes().node(randomNode.hostname()).get().allocation().get().membership().retired());
     }
 
     @Test
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 fd8eaf9d938..86f7ed45ce5 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
@@ -193,7 +193,7 @@ public class ProvisioningTester {
                     nodeRepository.nodes().write(node, lock);
                 }
                 if (node.parentHostname().isEmpty()) continue;
-                Node parent = nodeRepository.nodes().getNode(node.parentHostname().get()).get();
+                Node parent = nodeRepository.nodes().node(node.parentHostname().get()).get();
                 if (parent.state() == Node.State.active) continue;
                 NestedTransaction t = new NestedTransaction();
                 if (parent.ipConfig().primary().isEmpty())
@@ -316,7 +316,7 @@ public class ProvisioningTester {
     }
 
     public void fail(String hostname) {
-        int beforeFailCount = nodeRepository.nodes().getNode(hostname, Node.State.active).get().status().failCount();
+        int beforeFailCount = nodeRepository.nodes().node(hostname, Node.State.active).get().status().failCount();
         Node failedNode = nodeRepository.nodes().fail(hostname, Agent.system, "Failing to unit test");
         assertTrue(nodeRepository.nodes().list(Node.State.failed).nodeType(NodeType.tenant).asList().contains(failedNode));
         assertEquals(beforeFailCount + 1, failedNode.status().failCount());
@@ -561,7 +561,7 @@ public class ProvisioningTester {
 
     public void assertAllocatedOn(String explanation, String hostFlavor, ApplicationId app) {
         for (Node node : nodeRepository.nodes().list(app)) {
-            Node parent = nodeRepository.nodes().getNode(node.parentHostname().get()).get();
+            Node parent = nodeRepository.nodes().node(node.parentHostname().get()).get();
             assertEquals(node + ": " + explanation, hostFlavor, parent.flavor().name());
         }
     }
@@ -595,7 +595,7 @@ public class ProvisioningTester {
 
     public int hostFlavorCount(String hostFlavor, ApplicationId app) {
         return (int)nodeRepository().nodes().list(app).stream()
-                                    .map(n -> nodeRepository().nodes().getNode(n.parentHostname().get()).get())
+                                    .map(n -> nodeRepository().nodes().node(n.parentHostname().get()).get())
                                     .filter(p -> p.flavor().name().equals(hostFlavor))
                                     .count();
     }