diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-07-15 15:37:36 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2021-07-16 09:02:31 +0200 |
| commit | e0ac9ca91c7a15bbcdeb639d2953925e7f326e35 (patch) | |
| tree | 9b9f61a3ad5e7ff924f1388edb5b1f4f2b22fc0d /controller-server | |
| parent | 0b0140b6f0667cc09380a0d0e173f7c5ba8812ce (diff) | |
Remove NodeRepositoryNode from NodeRepository interface
Diffstat (limited to 'controller-server')
2 files changed, 9 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 1a4fa3fcd79..2b884cc950b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -876,7 +876,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { node.reservedTo().ifPresent(tenant -> nodeObject.setString("reservedTo", tenant.value())); nodeObject.setString("orchestration", valueOf(node.serviceState())); nodeObject.setString("version", node.currentVersion().toString()); - nodeObject.setString("flavor", node.flavor()); + node.flavor().ifPresent(flavor -> nodeObject.setString("flavor", flavor)); toSlime(node.resources(), nodeObject); nodeObject.setString("clusterId", node.clusterId()); nodeObject.setString("clusterType", valueOf(node.clusterType())); 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 2b9ba7587da..df9c9742349 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 @@ -17,11 +17,9 @@ import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node; import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepoStats; import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepository; import com.yahoo.vespa.hosted.controller.api.integration.configserver.TargetVersions; -import com.yahoo.vespa.hosted.controller.api.integration.noderepository.NodeRepositoryNode; import java.net.URI; import java.time.Duration; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -47,8 +45,14 @@ public class NodeRepositoryMock implements NodeRepository { private boolean hasSpareCapacity = false; @Override - public void addNodes(ZoneId zone, Collection<NodeRepositoryNode> nodes) { - throw new UnsupportedOperationException(); + public void addNodes(ZoneId zone, List<Node> nodes) { + Map<HostName, Node> existingNodes = nodeRepository.getOrDefault(zone, Map.of()); + for (var node : nodes) { + if (existingNodes.containsKey(node.hostname())) { + throw new IllegalArgumentException("Node " + node.hostname() + " already added in zone " + zone); + } + } + putNodes(zone, nodes); } @Override |