diff options
Diffstat (limited to 'node-admin/src/test/java')
12 files changed, 61 insertions, 61 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 2257fe5fac6..62a4b51e9d0 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 @@ -107,14 +107,14 @@ public class RealNodeRepositoryTest { final List<NodeSpec> containersToRun = nodeRepositoryApi.getNodes(dockerHostHostname); assertThat(containersToRun.size(), is(1)); final NodeSpec node = containersToRun.get(0); - assertThat(node.hostname, is("host4.yahoo.com")); - assertThat(node.wantedDockerImage.get(), is(new DockerImage("docker-registry.domain.tld:8080/dist/vespa:6.42.0"))); - assertThat(node.nodeState, is(Node.State.active)); - assertThat(node.wantedRestartGeneration.get(), is(0L)); - assertThat(node.currentRestartGeneration.get(), is(0L)); - assertThat(node.minCpuCores, is(0.2)); - assertThat(node.minMainMemoryAvailableGb, is(0.5)); - assertThat(node.minDiskAvailableGb, is(100.0)); + assertThat(node.getHostname(), is("host4.yahoo.com")); + assertThat(node.getWantedDockerImage().get(), is(new DockerImage("docker-registry.domain.tld:8080/dist/vespa:6.42.0"))); + assertThat(node.getState(), is(Node.State.active)); + assertThat(node.getWantedRestartGeneration().get(), is(0L)); + assertThat(node.getCurrentRestartGeneration().get(), is(0L)); + assertThat(node.getMinCpuCores(), is(0.2)); + assertThat(node.getMinMainMemoryAvailableGb(), is(0.5)); + assertThat(node.getMinDiskAvailableGb(), is(100.0)); } @Test @@ -122,7 +122,7 @@ public class RealNodeRepositoryTest { String hostname = "host4.yahoo.com"; Optional<NodeSpec> node = nodeRepositoryApi.getNode(hostname); assertThat(node.isPresent(), is(true)); - assertThat(node.get().hostname, is(hostname)); + assertThat(node.get().getHostname(), is(hostname)); } @Test @@ -188,8 +188,8 @@ public class RealNodeRepositoryTest { NodeSpec hostSpecInNodeRepo = nodeRepositoryApi.getNode("host123.domain.tld") .orElseThrow(RuntimeException::new); - assertEquals(host.nodeFlavor, hostSpecInNodeRepo.nodeFlavor); - assertEquals(host.nodeType, hostSpecInNodeRepo.nodeType); + assertEquals(host.nodeFlavor, hostSpecInNodeRepo.getFlavor()); + assertEquals(host.nodeType, hostSpecInNodeRepo.getNodeType()); assertTrue(nodeRepositoryApi.getNode("host123-1.domain.tld").isPresent()); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java index eb3945e7a37..a4de2e9ffe2 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java @@ -19,9 +19,9 @@ public class DockerFailTest { NodeSpec nodeSpec = new NodeSpec.Builder() .hostname("host1.test.yahoo.com") .wantedDockerImage(new DockerImage("dockerImage")) - .nodeState(Node.State.active) + .state(Node.State.active) .nodeType(NodeType.tenant) - .nodeFlavor("docker") + .flavor("docker") .wantedRestartGeneration(1L) .currentRestartGeneration(1L) .minCpuCores(1) diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java index c4ecbcbedcc..5619fd1bab3 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java @@ -22,15 +22,15 @@ public class MultiDockerTest { dockerTester.addNodeRepositoryNode( new NodeSpec.Builder(nodeSpec2) - .nodeState(Node.State.dirty) + .state(Node.State.dirty) .minCpuCores(1) .minMainMemoryAvailableGb(1) .minDiskAvailableGb(1) .build()); // Wait until it is marked ready - while (dockerTester.nodeRepositoryMock.getNode(nodeSpec2.hostname) - .filter(node -> node.nodeState != Node.State.ready).isPresent()) { + while (dockerTester.nodeRepositoryMock.getNode(nodeSpec2.getHostname()) + .filter(node -> node.getState() != Node.State.ready).isPresent()) { Thread.sleep(10); } @@ -67,9 +67,9 @@ public class MultiDockerTest { .hostname(hostName) .wantedDockerImage(dockerImage) .wantedVespaVersion("1.2.3") - .nodeState(Node.State.active) + .state(Node.State.active) .nodeType(NodeType.tenant) - .nodeFlavor("docker") + .flavor("docker") .wantedRestartGeneration(1L) .currentRestartGeneration(1L) .minCpuCores(1) diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java index 66e1592cfcb..13f1520e065 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeRepoMock.java @@ -68,14 +68,14 @@ public class NodeRepoMock implements NodeRepository { synchronized (monitor) { node.ifPresent(nrn -> updateNodeRepositoryNode(new NodeSpec.Builder(nrn) - .nodeState(nodeState) + .state(nodeState) .build())); callOrderVerifier.add("setNodeState " + hostName + " to " + nodeState); } } public void updateNodeRepositoryNode(NodeSpec nodeSpec) { - nodeRepositoryNodesByHostname.put(nodeSpec.hostname, nodeSpec); + nodeRepositoryNodesByHostname.put(nodeSpec.getHostname(), nodeSpec); } public int getNumberOfContainerSpecs() { diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java index f905659fb0c..c50d8e4efa9 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java @@ -18,9 +18,9 @@ public class NodeStateTest { private final NodeSpec initialNodeSpec = new NodeSpec.Builder() .hostname("host1.test.yahoo.com") .wantedDockerImage(new DockerImage("dockerImage")) - .nodeState(Node.State.active) + .state(Node.State.active) .nodeType(NodeType.tenant) - .nodeFlavor("docker") + .flavor("docker") .wantedRestartGeneration(1L) .currentRestartGeneration(1L) .minCpuCores(1) @@ -48,15 +48,15 @@ public class NodeStateTest { setup(dockerTester); // Change node state to dirty dockerTester.addNodeRepositoryNode(new NodeSpec.Builder(initialNodeSpec) - .nodeState(Node.State.dirty) + .state(Node.State.dirty) .minCpuCores(1) .minMainMemoryAvailableGb(1) .minDiskAvailableGb(1) .build()); // Wait until it is marked ready - while (dockerTester.nodeRepositoryMock.getNode(initialNodeSpec.hostname) - .filter(node -> node.nodeState != Node.State.ready).isPresent()) { + while (dockerTester.nodeRepositoryMock.getNode(initialNodeSpec.getHostname()) + .filter(node -> node.getState() != Node.State.ready).isPresent()) { Thread.sleep(10); } @@ -78,7 +78,7 @@ public class NodeStateTest { // Change node state to inactive and change the wanted docker image dockerTester.addNodeRepositoryNode(new NodeSpec.Builder(initialNodeSpec) .wantedDockerImage(newDockerImage) - .nodeState(Node.State.inactive) + .state(Node.State.inactive) .minCpuCores(1) .minMainMemoryAvailableGb(1) .minDiskAvailableGb(1) @@ -93,7 +93,7 @@ public class NodeStateTest { // Change node state to active dockerTester.addNodeRepositoryNode(new NodeSpec.Builder(initialNodeSpec) .wantedDockerImage(newDockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .minCpuCores(1) .minMainMemoryAvailableGb(1) .minDiskAvailableGb(1) diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java index 4f7460ebc26..f8746bcc22a 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RebootTest.java @@ -66,9 +66,9 @@ public class RebootTest { return new NodeSpec.Builder() .hostname("host1.test.yahoo.com") .wantedDockerImage(new DockerImage("dockerImage")) - .nodeState(Node.State.active) + .state(Node.State.active) .nodeType(NodeType.tenant) - .nodeFlavor("docker") + .flavor("docker") .vespaVersion("6.50.0") .wantedRestartGeneration(1L) .currentRestartGeneration(1L) diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java index 46bf6325ff5..d029d356d77 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java @@ -47,11 +47,11 @@ public class RestartTest { private NodeSpec createNodeRepositoryNode(long wantedRestartGeneration, long currentRestartGeneration) { return new NodeSpec.Builder() .hostname("host1.test.yahoo.com") - .nodeState(Node.State.active) + .state(Node.State.active) .wantedDockerImage(new DockerImage("image:1.2.3")) .wantedVespaVersion("1.2.3") .nodeType(NodeType.tenant) - .nodeFlavor("docker") + .flavor("docker") .wantedRestartGeneration(wantedRestartGeneration) .currentRestartGeneration(currentRestartGeneration) .minCpuCores(1) diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RunInContainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RunInContainerTest.java index 13dbbf37ee9..978db51aa77 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RunInContainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RunInContainerTest.java @@ -173,9 +173,9 @@ public class RunInContainerTest { Collections.singletonList(new NodeSpec.Builder() .hostname("host1.test.yahoo.com") .wantedDockerImage(new DockerImage("dockerImage")) - .nodeState(Node.State.active) + .state(Node.State.active) .nodeType(NodeType.tenant) - .nodeFlavor("docker") + .flavor("docker") .build())); doThrow(new OrchestratorException("Cannot suspend because...")).when(orchestratorMock) .suspend("localhost.test.yahoo.com", Arrays.asList("host1.test.yahoo.com", parentHostname)); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java index 8af9623d4bf..77c0a30ae18 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/logging/FilebeatConfigProviderTest.java @@ -54,8 +54,8 @@ public class FilebeatConfigProviderTest { public void it_does_not_generate_config_for_nodes_wihout_owner() { FilebeatConfigProvider filebeatConfigProvider = new FilebeatConfigProvider(getEnvironment(logstashNodes)); NodeSpec node = new NodeSpec.Builder() - .nodeFlavor("flavor") - .nodeState(Node.State.active) + .flavor("flavor") + .state(Node.State.active) .nodeType(NodeType.tenant) .hostname("hostname") .minCpuCores(1) @@ -111,8 +111,8 @@ public class FilebeatConfigProviderTest { NodeSpec.Owner owner = new NodeSpec.Owner(tenant, application, instance); return new NodeSpec.Builder() .owner(owner) - .nodeFlavor("flavor") - .nodeState(Node.State.active) + .flavor("flavor") + .state(Node.State.active) .nodeType(NodeType.tenant) .hostname("hostname") .minCpuCores(1) diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java index fccd43b6213..5abdd0d5d01 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java @@ -74,9 +74,9 @@ public class StorageMaintainerTest { ContainerName containerName = ContainerName.fromHostname(hostname); NodeSpec node = new NodeSpec.Builder() .hostname(hostname) - .nodeState(Node.State.ready) + .state(Node.State.ready) .nodeType(NodeType.tenant) - .nodeFlavor("docker") + .flavor("docker") .minCpuCores(1) .minMainMemoryAvailableGb(1) .minDiskAvailableGb(1) diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImplTest.java index 37af58ab9d0..607dc080a90 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterImplTest.java @@ -56,7 +56,7 @@ public class NodeAdminStateUpdaterImplTest { public void testStateConvergence() { mockNodeRepo(4); List<String> activeHostnames = nodeRepository.getNodes(parentHostname).stream() - .map(node -> node.hostname) + .map(NodeSpec::getHostname) .collect(Collectors.toList()); List<String> suspendHostnames = new ArrayList<>(activeHostnames); suspendHostnames.add(parentHostname); @@ -186,9 +186,9 @@ public class NodeAdminStateUpdaterImplTest { List<NodeSpec> containersToRun = IntStream.range(0, numberOfNodes) .mapToObj(i -> new NodeSpec.Builder() .hostname("host" + i + ".test.yahoo.com") - .nodeState(Node.State.active) + .state(Node.State.active) .nodeType(NodeType.tenant) - .nodeFlavor("docker") + .flavor("docker") .minCpuCores(1) .minMainMemoryAvailableGb(1) .minDiskAvailableGb(1) diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java index 7285d6a424d..4ba030455f5 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java @@ -96,7 +96,7 @@ public class NodeAgentImplTest { private final NodeSpec.Builder nodeBuilder = new NodeSpec.Builder() .hostname(hostName) .nodeType(NodeType.tenant) - .nodeFlavor("docker") + .flavor("docker") .minCpuCores(MIN_CPU_CORES) .minMainMemoryAvailableGb(MIN_MAIN_MEMORY_AVAILABLE_GB) .minDiskAvailableGb(MIN_DISK_AVAILABLE_GB); @@ -109,7 +109,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) .currentDockerImage(dockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .wantedVespaVersion(vespaVersion) .vespaVersion(vespaVersion) .wantedRestartGeneration(restartGeneration) @@ -141,7 +141,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) .currentDockerImage(dockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .wantedVespaVersion(vespaVersion) .vespaVersion(vespaVersion) .wantedRestartGeneration(restartGeneration) @@ -165,7 +165,7 @@ public class NodeAgentImplTest { final long rebootGeneration = 0; final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .wantedVespaVersion(vespaVersion) .wantedRestartGeneration(restartGeneration) .currentRestartGeneration(restartGeneration) @@ -207,7 +207,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .wantedDockerImage(newDockerImage) .currentDockerImage(dockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .wantedVespaVersion(vespaVersion) .vespaVersion(vespaVersion) .wantedRestartGeneration(wantedRestartGeneration) @@ -237,7 +237,7 @@ public class NodeAgentImplTest { NodeSpec.Builder specBuilder = nodeBuilder .wantedDockerImage(dockerImage) .currentDockerImage(dockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .wantedVespaVersion(vespaVersion) .vespaVersion(vespaVersion) .wantedRestartGeneration(wantedRestartGeneration) @@ -277,7 +277,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) .currentDockerImage(dockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .wantedVespaVersion(vespaVersion) .vespaVersion(vespaVersion) .wantedRestartGeneration(wantedRestartGeneration) @@ -303,7 +303,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) .currentDockerImage(dockerImage) - .nodeState(Node.State.failed) + .state(Node.State.failed) .wantedVespaVersion(vespaVersion) .vespaVersion(vespaVersion) .wantedRestartGeneration(restartGeneration) @@ -326,7 +326,7 @@ public class NodeAgentImplTest { final long restartGeneration = 1; final long rebootGeneration = 0; final NodeSpec node = nodeBuilder - .nodeState(Node.State.ready) + .state(Node.State.ready) .wantedRestartGeneration(restartGeneration) .currentRestartGeneration(restartGeneration) .wantedRebootGeneration(rebootGeneration) @@ -357,7 +357,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) .currentDockerImage(dockerImage) - .nodeState(Node.State.inactive) + .state(Node.State.inactive) .wantedVespaVersion(vespaVersion) .vespaVersion(vespaVersion) .wantedRestartGeneration(restartGeneration) @@ -385,7 +385,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) - .nodeState(Node.State.reserved) + .state(Node.State.reserved) .wantedVespaVersion(vespaVersion) .wantedRestartGeneration(restartGeneration) .currentRestartGeneration(restartGeneration) @@ -409,7 +409,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) .currentDockerImage(dockerImage) - .nodeState(nodeState) + .state(nodeState) .build(); NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); @@ -449,7 +449,7 @@ public class NodeAgentImplTest { public void provisionedNodeIsMarkedAsDirty() { final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) - .nodeState(Node.State.provisioned) + .state(Node.State.provisioned) .build(); NodeAgentImpl nodeAgent = makeNodeAgent(null, false); @@ -464,7 +464,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .currentDockerImage(dockerImage) .wantedDockerImage(dockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .vespaVersion(vespaVersion) .build(); @@ -488,7 +488,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) .currentDockerImage(dockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .vespaVersion(vespaVersion) .wantedRestartGeneration(restartGeneration) .currentRestartGeneration(restartGeneration) @@ -554,7 +554,7 @@ public class NodeAgentImplTest { final long rebootGeneration = 0; final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .wantedVespaVersion(vespaVersion) .wantedRestartGeneration(restartGeneration) .currentRestartGeneration(restartGeneration) @@ -612,7 +612,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .wantedDockerImage(dockerImage) .currentDockerImage(dockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .vespaVersion(vespaVersion) .owner(owner) .membership(membership) @@ -659,7 +659,7 @@ public class NodeAgentImplTest { @Test public void testGetRelevantMetricsForReadyNode() { final NodeSpec node = nodeBuilder - .nodeState(Node.State.ready) + .state(Node.State.ready) .build(); NodeAgentImpl nodeAgent = makeNodeAgent(null, false); @@ -681,7 +681,7 @@ public class NodeAgentImplTest { final NodeSpec node = nodeBuilder .nodeType(NodeType.config) .wantedDockerImage(dockerImage) - .nodeState(Node.State.active) + .state(Node.State.active) .wantedVespaVersion(vespaVersion) .build(); |