diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-08-26 15:43:16 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-08-26 15:43:16 +0200 |
commit | cfbfe5956483acd28c0b38121ce2d14ab742f756 (patch) | |
tree | 2a62fad443d742e56122fad17fb2db354af7f429 /node-admin/src/test/java | |
parent | 46c23316a8c728d7aede2c243ac2823b3938f023 (diff) |
Update AddNode with resources and flavor overrides
Diffstat (limited to 'node-admin/src/test/java')
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java index 0938eb23b49..e30572fc63e 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepositoryTest.java @@ -1,11 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - package com.yahoo.vespa.hosted.node.admin.configserver.noderepository; import com.yahoo.application.Networking; import com.yahoo.application.container.JDisc; import com.yahoo.config.provision.DockerImage; +import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; +import com.yahoo.config.provision.host.FlavorOverrides; import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerApi; import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerApiImpl; import com.yahoo.vespa.hosted.provision.testutils.ContainerConfig; @@ -17,11 +18,10 @@ import java.io.IOException; import java.net.ServerSocket; import java.net.URI; import java.time.Instant; -import java.util.Arrays; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Optional; +import java.util.Set; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; @@ -162,23 +162,22 @@ public class RealNodeRepositoryTest { @Test public void testAddNodes() { - AddNode host = new AddNode("host123.domain.tld", "default", NodeType.confighost, - Collections.singleton("::1"), new HashSet<>(Arrays.asList("::2", "::3"))); - - AddNode node = new AddNode("host123-1.domain.tld", "host123.domain.tld", "docker", NodeType.config, - new HashSet<>(Arrays.asList("::2", "::3"))); + AddNode host = AddNode.forHost("host123.domain.tld", "default", Optional.of(FlavorOverrides.ofDisk(123)), NodeType.confighost, + Set.of("::1"), Set.of("::2", "::3")); - List<AddNode> nodesToAdd = Arrays.asList(host, node); + NodeResources nodeResources = new NodeResources(1, 2, 3, 4, NodeResources.DiskSpeed.slow); + AddNode node = AddNode.forNode("host123-1.domain.tld", "host123.domain.tld", nodeResources, NodeType.config, Set.of("::2", "::3")); assertFalse(nodeRepositoryApi.getOptionalNode("host123.domain.tld").isPresent()); - nodeRepositoryApi.addNodes(nodesToAdd); - - NodeSpec hostSpecInNodeRepo = nodeRepositoryApi.getOptionalNode("host123.domain.tld") - .orElseThrow(RuntimeException::new); + nodeRepositoryApi.addNodes(List.of(host, node)); - assertEquals(host.nodeFlavor, hostSpecInNodeRepo.flavor()); - assertEquals(host.nodeType, hostSpecInNodeRepo.type()); + NodeSpec hostSpec = nodeRepositoryApi.getOptionalNode("host123.domain.tld").orElseThrow(); + assertEquals("default", hostSpec.flavor()); + assertEquals(123, hostSpec.diskGb(), 0); + assertEquals(NodeType.confighost, hostSpec.type()); - assertTrue(nodeRepositoryApi.getOptionalNode("host123-1.domain.tld").isPresent()); + NodeSpec nodeSpec = nodeRepositoryApi.getOptionalNode("host123-1.domain.tld").orElseThrow(); + assertEquals(nodeResources, nodeSpec.resources()); + assertEquals(NodeType.config, nodeSpec.type()); } } |