Rename methods

11 files changed, 61 insertions, 55 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
index 99325ff909d..d86d2960c74 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
@@ -212,8 +212,8 @@ public class InternalStepRunnerTest {
         Node systemTestNode = tester.configServer().nodeRepository().list(JobType.systemTest.zone(system()),
                                                                           app.instanceId()).iterator().next();
         tester.clock().advance(InternalStepRunner.Timeouts.of(system()).noNodesDown().minus(Duration.ofSeconds(1)));
-        tester.configServer().nodeRepository().putByHostname(JobType.systemTest.zone(system()),
-                                                             new Node.Builder(systemTestNode)
+        tester.configServer().nodeRepository().putNodes(JobType.systemTest.zone(system()),
+                                                        new Node.Builder(systemTestNode)
                                                                      .serviceState(Node.ServiceState.allowedDown)
                                                                      .suspendedSince(tester.clock().instant())
                                                                      .build());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
index 9e9d27fd744..d5a71d5adca 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
@@ -100,23 +100,23 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
     public void provision(ZoneId zone, ApplicationId application) {
         Node parent = nodeRepository().list(zone, SystemApplication.tenantHost.id()).stream().findAny()
                                       .orElseThrow(() -> new IllegalStateException("No parent hosts in " + zone));
-        nodeRepository().putByHostname(zone, new Node.Builder().hostname(hostFor(application, zone))
-                                                               .state(Node.State.reserved)
-                                                               .type(NodeType.tenant)
-                                                               .owner(application)
-                                                               .parentHostname(parent.hostname())
-                                                               .currentVersion(initialVersion)
-                                                               .wantedVersion(initialVersion)
-                                                               .currentDockerImage(initialDockerImage)
-                                                               .wantedDockerImage(initialDockerImage)
-                                                               .currentOsVersion(Version.emptyVersion)
-                                                               .wantedOsVersion(Version.emptyVersion)
-                                                               .resources(new NodeResources(2, 8, 50, 1, slow, remote))
-                                                               .serviceState(Node.ServiceState.unorchestrated)
-                                                               .flavor("d-2-8-50")
-                                                               .clusterId("cluster")
-                                                               .clusterType(Node.ClusterType.container)
-                                                               .build());
+        nodeRepository().putNodes(zone, new Node.Builder().hostname(hostFor(application, zone))
+                                                          .state(Node.State.reserved)
+                                                          .type(NodeType.tenant)
+                                                          .owner(application)
+                                                          .parentHostname(parent.hostname())
+                                                          .currentVersion(initialVersion)
+                                                          .wantedVersion(initialVersion)
+                                                          .currentDockerImage(initialDockerImage)
+                                                          .wantedDockerImage(initialDockerImage)
+                                                          .currentOsVersion(Version.emptyVersion)
+                                                          .wantedOsVersion(Version.emptyVersion)
+                                                          .resources(new NodeResources(2, 8, 50, 1, slow, remote))
+                                                          .serviceState(Node.ServiceState.unorchestrated)
+                                                          .flavor("d-2-8-50")
+                                                          .clusterId("cluster")
+                                                          .clusterType(Node.ClusterType.container)
+                                                          .build());
     }
 
     public HostName hostFor(ApplicationId application, ZoneId zone) {
@@ -146,7 +146,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
                                                     .currentOsVersion(Version.emptyVersion).wantedOsVersion(Version.emptyVersion)
                                                     .build())
                                             .collect(Collectors.toList());
-                nodeRepository().putByHostname(zone, nodes);
+                nodeRepository().putNodes(zone, nodes);
                 convergeServices(application.id(), zone);
             }
         }
@@ -206,7 +206,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
             } else {
                 newNode = new Node.Builder(node).currentVersion(version).wantedVersion(version).build();
             }
-            nodeRepository().putByHostname(zone, newNode);
+            nodeRepository().putNodes(zone, newNode);
             if (++n == nodeCount) break;
         }
     }
@@ -355,7 +355,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
             application.activate();
             List<Node> nodes = nodeRepository.list(id.zoneId(), id.applicationId());
             for (Node node : nodes) {
-                nodeRepository.putByHostname(id.zoneId(), new Node.Builder(node)
+                nodeRepository.putNodes(id.zoneId(), new Node.Builder(node)
                         .state(Node.State.active)
                         .wantedVersion(application.version().get())
                         .build());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
index 4aab21a44fe..1e535e7e9de 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
@@ -36,24 +36,33 @@ public class NodeRepositoryMock implements NodeRepository {
     private final Map<ZoneId, Map<HostName, Node>> nodeRepository = new HashMap<>();
     private final Map<ZoneId, TargetVersions> targetVersions = new HashMap<>();
 
-    public void putByHostname(ZoneId zone, List<Node> nodes) {
+    /** Add or update given nodes in zone */
+    public void putNodes(ZoneId zone, List<Node> nodes) {
         nodeRepository.putIfAbsent(zone, new HashMap<>());
         nodeRepository.get(zone).putAll(nodes.stream().collect(Collectors.toMap(Node::hostname,
                                                                                 Function.identity())));
     }
 
-    public void putByHostname(ZoneId zone, Node node) {
-        putByHostname(zone, Collections.singletonList(node));
+    /** Add or update given node in zone */
+    public void putNodes(ZoneId zone, Node node) {
+        putNodes(zone, Collections.singletonList(node));
     }
 
-    public void removeByHostname(ZoneId zone, List<Node> nodes) {
+    /** Remove given nodes from zone */
+    public void removeNodes(ZoneId zone, List<Node> nodes) {
         nodes.forEach(node -> nodeRepository.get(zone).remove(node.hostname()));
     }
 
+    /** Remove all nodes in all zones */
     public void clear() {
         nodeRepository.clear();
     }
 
+    /** Replace nodes in zone with given nodes */
+    public void setNodes(ZoneId zone, List<Node> nodes) {
+        nodeRepository.put(zone, nodes.stream().collect(Collectors.toMap(Node::hostname, Function.identity())));
+    }
+
     public Node require(HostName hostName) {
         return nodeRepository.values().stream()
                              .map(zoneNodes -> zoneNodes.get(hostName))
@@ -62,11 +71,8 @@ public class NodeRepositoryMock implements NodeRepository {
                              .orElseThrow(() -> new NoSuchElementException("No node with the hostname " + hostName + " is known."));
     }
 
-    public void addNodes(ZoneId zone, List<Node> nodes) {
-        nodeRepository.put(zone, nodes.stream().collect(Collectors.toMap(Node::hostname, Function.identity())));
-    }
-
-    public void addFixedNodes(ZoneId zone) {
+    /** Replace nodes in zone with a fixed set of nodes */
+    public void setFixedNodes(ZoneId zone) {
         var nodeA = new Node.Builder()
                 .hostname(HostName.from("hostA"))
                 .parentHostname(HostName.from("parentHostA"))
@@ -98,7 +104,7 @@ public class NodeRepositoryMock implements NodeRepository {
                 .clusterId("clusterB")
                 .clusterType(Node.ClusterType.container)
                 .build();
-        addNodes(zone, List.of(nodeA, nodeB));
+        setNodes(zone, List.of(nodeA, nodeB));
     }
 
     @Override
@@ -168,7 +174,7 @@ public class NodeRepositoryMock implements NodeRepository {
                       .stream()
                       .filter(node -> node.type() == type)
                       .map(node -> new Node.Builder(node).wantedVersion(version).build())
-                      .forEach(node -> putByHostname(zone, node));
+                      .forEach(node -> putNodes(zone, node));
     }
 
     @Override
@@ -184,7 +190,7 @@ public class NodeRepositoryMock implements NodeRepository {
                       .stream()
                       .filter(node -> node.type() == type)
                       .map(node -> new Node.Builder(node).wantedOsVersion(version).build())
-                      .forEach(node -> putByHostname(zone, node));
+                      .forEach(node -> putNodes(zone, node));
     }
 
     @Override
@@ -219,8 +225,8 @@ public class NodeRepositoryMock implements NodeRepository {
         List<Node> nodes = hostname.map(this::require)
                                    .map(Collections::singletonList)
                                    .orElse(list(deployment.zoneId(), deployment.applicationId()));
-        putByHostname(deployment.zoneId(),
-                      nodes.stream().map(modification).collect(Collectors.toList()));
+        putNodes(deployment.zoneId(),
+                 nodes.stream().map(modification).collect(Collectors.toList()));
     }
 
     public void requestRestart(DeploymentId deployment, Optional<HostName> hostname) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporterTest.java
index 1c66a01db8e..369ecaf5eb7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventReporterTest.java
@@ -97,7 +97,7 @@ public class CloudEventReporterTest {
                 awsZone1,
                 awsZone2);
 
-        tester.configServer().nodeRepository().putByHostname(
+        tester.configServer().nodeRepository().putNodes(
                 nonAwsZone.getId(),
                 createNodesWithHostnames(
                         "host1.com",
@@ -105,7 +105,7 @@ public class CloudEventReporterTest {
                         "host3.com"
                 )
         );
-        tester.configServer().nodeRepository().putByHostname(
+        tester.configServer().nodeRepository().putNodes(
                 awsZone1.getId(),
                 createNodesWithHostnames(
                         "host1.com",
@@ -113,14 +113,14 @@ public class CloudEventReporterTest {
                         "host3.com"
                 )
         );
-        tester.configServer().nodeRepository().putByHostname(
+        tester.configServer().nodeRepository().putNodes(
                 awsZone2.getId(),
                 createNodesWithHostnames(
                         "host4.com",
                         "host5.com"
                 )
         );
-        tester.configServer().nodeRepository().putByHostname(
+        tester.configServer().nodeRepository().putNodes(
                 awsZone2.getId(),
                 List.of(createNode("confighost.com", NodeType.confighost))
         );
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainerTest.java
index ca624281e94..b19003ff734 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainerTest.java
@@ -54,7 +54,7 @@ public class CostReportMaintainerTest {
 
     private void addNodes() {
         for (var zone : tester.zoneRegistry().zones().all().zones()) {
-            tester.configServer().nodeRepository().addFixedNodes(zone.getId());
+            tester.configServer().nodeRepository().setFixedNodes(zone.getId());
         }
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
index 9d910afd476..baa4b29ac1d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java
@@ -146,7 +146,7 @@ public class OsUpgraderTest {
             throw new IllegalArgumentException("No nodes allocated to " + application.id());
         }
         Node node = nodes.get(0);
-        nodeRepository().putByHostname(zone, new Node.Builder(node).state(Node.State.failed).build());
+        nodeRepository().putNodes(zone, new Node.Builder(node).state(Node.State.failed).build());
     }
 
     /** Simulate OS upgrade of nodes allocated to application. In a real system this is done by the node itself */
@@ -154,7 +154,7 @@ public class OsUpgraderTest {
         assertWanted(version, application, zones);
         for (ZoneId zone : zones) {
             for (Node node : nodesRequiredToUpgrade(zone, application)) {
-                nodeRepository().putByHostname(zone, new Node.Builder(node).wantedOsVersion(version).currentOsVersion(version).build());
+                nodeRepository().putNodes(zone, new Node.Builder(node).wantedOsVersion(version).currentOsVersion(version).build());
             }
             assertCurrent(version, application, zone);
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
index e0a97d32597..8379722be66 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
@@ -64,10 +64,10 @@ public class ResourceMeterMaintainerTest {
                 nonAwsZone,
                 awsZone1,
                 awsZone2);
-        tester.configServer().nodeRepository().addFixedNodes(nonAwsZone.getId());
-        tester.configServer().nodeRepository().addFixedNodes(awsZone1.getId());
-        tester.configServer().nodeRepository().addFixedNodes(awsZone2.getId());
-        tester.configServer().nodeRepository().putByHostname(
+        tester.configServer().nodeRepository().setFixedNodes(nonAwsZone.getId());
+        tester.configServer().nodeRepository().setFixedNodes(awsZone1.getId());
+        tester.configServer().nodeRepository().setFixedNodes(awsZone2.getId());
+        tester.configServer().nodeRepository().putNodes(
                 awsZone1.getId(),
                 createNodesInState(
                         Node.State.provisioned,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
index 653a4c5394b..66b125186e0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
@@ -46,9 +46,9 @@ public class ResourceTagMaintainerTest {
                 nonAwsZone,
                 awsZone1,
                 awsZone2);
-        tester.configServer().nodeRepository().addFixedNodes(nonAwsZone.getId());
-        tester.configServer().nodeRepository().addFixedNodes(awsZone1.getId());
-        tester.configServer().nodeRepository().addFixedNodes(awsZone2.getId());
+        tester.configServer().nodeRepository().setFixedNodes(nonAwsZone.getId());
+        tester.configServer().nodeRepository().setFixedNodes(awsZone1.getId());
+        tester.configServer().nodeRepository().setFixedNodes(awsZone2.getId());
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
index 140c37cdd94..f1031c90344 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
@@ -302,7 +302,7 @@ public class SystemUpgraderTest {
         assertWantedVersion(application, version, first, rest);
         Stream.concat(Stream.of(first), Stream.of(rest)).forEach(zone -> {
             for (Node node : listNodes(zone, application)) {
-                nodeRepository().putByHostname(
+                nodeRepository().putNodes(
                         zone.getId(),
                         new Node.Builder(node).currentVersion(node.wantedVersion()).build());
             }
@@ -326,7 +326,7 @@ public class SystemUpgraderTest {
             throw new IllegalArgumentException("No nodes allocated to " + application.id());
         }
         Node node = nodes.get(0);
-        nodeRepository().putByHostname(
+        nodeRepository().putNodes(
                 zone.getId(),
                 new Node.Builder(node).state(Node.State.failed).build());
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java
index 7370cf12d5a..9f63c714786 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java
@@ -144,7 +144,7 @@ public class OsApiTest extends ControllerContainerTest {
                 var targetVersion = nodeRepository().targetVersionsOf(zone).osVersion(application.nodeType());
                 for (Node node : nodeRepository().list(zone, application.id())) {
                     var version = targetVersion.orElse(node.wantedOsVersion());
-                    nodeRepository().putByHostname(zone, new Node.Builder(node).currentOsVersion(version).wantedOsVersion(version).build());
+                    nodeRepository().putNodes(zone, new Node.Builder(node).currentOsVersion(version).wantedOsVersion(version).build());
                 }
             }
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
index f60d11693d8..44e172d9f93 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
@@ -72,7 +72,7 @@ public class VersionStatusTest {
         for (ZoneApi zone : tester.zoneRegistry().zones().all().zones()) {
             for (Node node : tester.configServer().nodeRepository().list(zone.getId(), SystemApplication.configServer.id())) {
                 Node upgradedNode = new Node.Builder(node).currentVersion(version1).build();
-                tester.configServer().nodeRepository().putByHostname(zone.getId(), upgradedNode);
+                tester.configServer().nodeRepository().putNodes(zone.getId(), upgradedNode);
                 break;
             }
         }
@@ -116,7 +116,7 @@ public class VersionStatusTest {
         for (ZoneApi zone : tester.controller().zoneRegistry().zones().all().zones()) {
             for (Node node : tester.configServer().nodeRepository().list(zone.getId(), SystemApplication.configServer.id())) {
                 Node downgradedNode = new Node.Builder(node).currentVersion(ancientVersion).build();
-                tester.configServer().nodeRepository().putByHostname(zone.getId(), downgradedNode);
+                tester.configServer().nodeRepository().putNodes(zone.getId(), downgradedNode);
                 break;
             }
         }