diff options
| author | Valerij Fredriksen <valerijf@oath.com> | 2017-11-07 13:56:18 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2017-11-07 13:56:18 +0100 |
| commit | 3d096417609d6a1d5ee944e91760e4ef06ad95d7 (patch) | |
| tree | 0cafc48a404ba86ee8b51d41a2cca35fb8355fcd /node-admin | |
| parent | 42e32dd697f648111c3e41f5a763b94e7cf1fb23 (diff) | |
flavor -> resources
Diffstat (limited to 'node-admin')
2 files changed, 3 insertions, 3 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index 7b61436837c..09eb14039e8 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -322,9 +322,9 @@ public class NodeAgentImpl implements NodeAgent { ContainerResources wantedContainerResources = ContainerResources.from( nodeSpec.minCpuCores, nodeSpec.minMainMemoryAvailableGb); - if (!wantedContainerResources.equals(existingContainer.flavor)) { + if (!wantedContainerResources.equals(existingContainer.resources)) { return Optional.of("Container should be running with different resource allocation, wanted: " + - wantedContainerResources + ", actual: " + existingContainer.flavor); + wantedContainerResources + ", actual: " + existingContainer.resources); } return Optional.empty(); } diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java index 2cf0f4680a0..a1cc1850d23 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java @@ -92,7 +92,7 @@ public class DockerMock implements Docker { callOrderVerifier.add("stopContainer with " + containerName); Container container = containersByContainerName.get(containerName); containersByContainerName.put(containerName, - new Container(container.hostname, container.image, container.flavor, container.name, Container.State.EXITED, 0)); + new Container(container.hostname, container.image, container.resources, container.name, Container.State.EXITED, 0)); } } |