Move node operations into a separate class

1 files changed, 5 insertions, 5 deletions

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 ce2ab1dfa87..debc1484e58 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
@@ -67,13 +67,13 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer {
 
     @Override
     protected boolean maintain() {
-        if ( ! nodeRepository().isWorking()) return false;
+        if ( ! nodeRepository().nodes().isWorking()) return false;
 
         boolean success = true;
         // Don't need to maintain spare capacity in dynamically provisioned zones; can provision more on demand.
         if (nodeRepository().zone().getCloud().dynamicProvisioning()) return success;
 
-        NodeList allNodes = nodeRepository().list();
+        NodeList allNodes = nodeRepository().nodes().list();
         CapacityChecker capacityChecker = new CapacityChecker(allNodes);
 
         List<Node> overcommittedHosts = capacityChecker.findOvercommittedHosts();
@@ -116,7 +116,7 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer {
         if (nodeWhichCantMove.isEmpty()) return List.of();
 
         Node node = nodeWhichCantMove.get();
-        NodeList allNodes = nodeRepository().list();
+        NodeList allNodes = nodeRepository().nodes().list();
         // Allocation will assign the spareCount most empty nodes as "spares", which will not be allocated on
         // unless needed for node failing. Our goal here is to make room on these spares for the given node
         HostCapacity hostCapacity = new HostCapacity(allNodes, nodeRepository().resourcesCalculator());
@@ -165,11 +165,11 @@ 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().getNode(nodeToRetire.get().hostname())
+            Optional<Node> nodeWithWantToRetire = nodeRepository().nodes().getNode(nodeToRetire.get().hostname())
                     .map(node -> node.withWantToRetire(true, Agent.SpareCapacityMaintainer, nodeRepository().clock().instant()));
             if (nodeWithWantToRetire.isEmpty()) return;
 
-            nodeRepository().write(nodeWithWantToRetire.get(), deployment.applicationLock().get());
+            nodeRepository().nodes().write(nodeWithWantToRetire.get(), deployment.applicationLock().get());
             log.log(Level.INFO, String.format("Redeploying %s to relocate %s from overcommited host",
                     application, nodeToRetire.get().hostname()));
             deployment.activate();