diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-12-03 15:57:06 +0100 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-12-03 15:57:06 +0100 |
| commit | 0ef5a1e4a2080d262a4d469c7e4faef44246651b (patch) | |
| tree | 7e401900a69b4642d32993ffb97a188f6e967627 /controller-server | |
| parent | 2adce76ce658a5e31f993995b9af2299d3934131 (diff) | |
Revert change to node repo mock and use different method to add nodes
Diffstat (limited to 'controller-server')
2 files changed, 2 insertions, 5 deletions
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 9c48c1adb85..36f962d653f 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 @@ -63,10 +63,7 @@ public class NodeRepositoryMock implements NodeRepository { } public void addNodes(ZoneId zone, List<Node> nodes) { - var existingNodes = nodeRepository.getOrDefault(zone, new HashMap<>()); - var newNodes = nodes.stream().collect(Collectors.toMap(Node::hostname, Function.identity())); - newNodes.forEach(existingNodes::put); - nodeRepository.put(zone, existingNodes); + nodeRepository.put(zone, nodes.stream().collect(Collectors.toMap(Node::hostname, Function.identity()))); } public void addFixedNodes(ZoneId 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 f23a59adc36..26012443e3e 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 @@ -68,7 +68,7 @@ public class ResourceMeterMaintainerTest { tester.configServer().nodeRepository().addFixedNodes(nonAwsZone.getId()); tester.configServer().nodeRepository().addFixedNodes(awsZone1.getId()); tester.configServer().nodeRepository().addFixedNodes(awsZone2.getId()); - tester.configServer().nodeRepository().addNodes( + tester.configServer().nodeRepository().putByHostname( awsZone1.getId(), createNodesInState( Node.State.provisioned, |