diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-02 11:16:11 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-02 12:04:23 +0100 |
commit | eb7c0d96095c820ff811a3cba11e3c2564acbdd9 (patch) | |
tree | e7f3c74be4c4fe317a731ef9977dce785effab21 /node-admin/src/test | |
parent | 6d7909e022817be11b5f088cbd1e537d9b71919d (diff) |
NodeSpec::vcpus -> vcpu
Diffstat (limited to 'node-admin/src/test')
5 files changed, 8 insertions, 8 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 9cdb815a8ec..9b392395045 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 @@ -110,7 +110,7 @@ public class RealNodeRepositoryTest { assertThat(node.state(), is(NodeState.active)); assertThat(node.wantedRestartGeneration().get(), is(0L)); assertThat(node.currentRestartGeneration().get(), is(0L)); - assertEquals(1, node.vcpus(), delta); + assertEquals(1, node.vcpu(), delta); assertEquals(4, node.memoryGb(), delta); assertEquals(100, node.diskGb(), delta); } 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 aacb2cafd30..7776bf1f224 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 @@ -33,7 +33,7 @@ public class DockerFailTest { .flavor("docker") .wantedRestartGeneration(1L) .currentRestartGeneration(1L) - .vcpus(1) + .vcpu(1) .memoryGb(1) .diskGb(1) .build()); 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 8163f90e31f..a09c6a9e907 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 @@ -28,7 +28,7 @@ public class MultiDockerTest { tester.addChildNodeRepositoryNode( new NodeSpec.Builder(nodeSpec2) .state(NodeState.dirty) - .vcpus(1) + .vcpu(1) .memoryGb(1) .diskGb(1) .build()); @@ -51,7 +51,7 @@ public class MultiDockerTest { .flavor("docker") .wantedRestartGeneration(1L) .currentRestartGeneration(1L) - .vcpus(2) + .vcpu(2) .memoryGb(4) .diskGb(1) .build(); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java index bb18e261301..9a25e4188f9 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdaterTest.java @@ -263,7 +263,7 @@ public class NodeAdminStateUpdaterTest { .state(NodeState.active) .type(NodeType.tenant) .flavor("docker") - .vcpus(1) + .vcpu(1) .memoryGb(1) .diskGb(1) .build()) @@ -276,7 +276,7 @@ public class NodeAdminStateUpdaterTest { .state(hostState) .type(NodeType.tenant) .flavor("default") - .vcpus(1) + .vcpu(1) .memoryGb(1) .diskGb(1) .build()); 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 63f980efd91..17850b0fcbd 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 @@ -54,7 +54,7 @@ public class NodeAgentImplTest { .hostname(hostName) .type(NodeType.tenant) .flavor("docker") - .vcpus(MIN_CPU_CORES) + .vcpu(MIN_CPU_CORES) .memoryGb(MIN_MAIN_MEMORY_AVAILABLE_GB) .diskGb(MIN_DISK_AVAILABLE_GB); @@ -239,7 +239,7 @@ public class NodeAgentImplTest { nodeAgent.doConverge(firstContext); NodeAgentContext secondContext = createContext(specBuilder.diskGb(200).build()); nodeAgent.doConverge(secondContext); - NodeAgentContext thirdContext = createContext(specBuilder.vcpus(4).build()); + NodeAgentContext thirdContext = createContext(specBuilder.vcpu(4).build()); nodeAgent.doConverge(thirdContext); ContainerResources resourcesAfterThird = ContainerResources.from(0, 4, 16); mockGetContainer(dockerImage, resourcesAfterThird, true); |