diff options
author | toby <smorgrav@yahoo-inc.com> | 2017-08-23 14:40:31 +0200 |
---|---|---|
committer | toby <smorgrav@yahoo-inc.com> | 2017-08-25 10:34:27 +0200 |
commit | 9a002b237f31a2e919f7a597b0ae1fc9684bbeb8 (patch) | |
tree | 03c981475de69dc3f227d31eb39cbbd331bd9fae /node-repository/src/test | |
parent | 5d29f8eb820023aa072d12d541ae5e3f09c1cfc1 (diff) |
Mark new docker nodes as headroom violators on non-violated hosts
Diffstat (limited to 'node-repository/src/test')
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java index 55e1ff8de9f..dce9f694647 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java @@ -72,20 +72,20 @@ public class DockerHostCapacityTest { @Test public void hasCapacity() { - assertTrue(capacity.hasCapacity(host1, flavorDocker)); - assertTrue(capacity.hasCapacity(host1, flavorDocker2)); - assertTrue(capacity.hasCapacity(host2, flavorDocker)); - assertTrue(capacity.hasCapacity(host2, flavorDocker2)); - assertFalse(capacity.hasCapacity(host3, flavorDocker)); // No ip available - assertFalse(capacity.hasCapacity(host3, flavorDocker2)); // No ip available + assertTrue(capacity.hasCapacity(host1, ResourceCapacity.of(flavorDocker))); + assertTrue(capacity.hasCapacity(host1, ResourceCapacity.of(flavorDocker2))); + assertTrue(capacity.hasCapacity(host2, ResourceCapacity.of(flavorDocker))); + assertTrue(capacity.hasCapacity(host2, ResourceCapacity.of(flavorDocker2))); + assertFalse(capacity.hasCapacity(host3, ResourceCapacity.of(flavorDocker))); // No ip available + assertFalse(capacity.hasCapacity(host3, ResourceCapacity.of(flavorDocker2))); // No ip available // Add a new node to host1 to deplete the memory resource Node nodeF = Node.create("nodeF", Collections.singleton("::6"), Collections.emptySet(), "nodeF", Optional.of("host1"), flavorDocker, NodeType.tenant); nodes.add(nodeF); capacity = new DockerHostCapacity(nodes); - assertFalse(capacity.hasCapacity(host1, flavorDocker)); - assertFalse(capacity.hasCapacity(host1, flavorDocker2)); + assertFalse(capacity.hasCapacity(host1, ResourceCapacity.of(flavorDocker))); + assertFalse(capacity.hasCapacity(host1, ResourceCapacity.of(flavorDocker2))); } @Test |