diff options
Diffstat (limited to 'node-repository/src/test')
2 files changed, 4 insertions, 5 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java index 715ecdb5949..c40f265db51 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java @@ -94,7 +94,7 @@ public class OsVersionsTest { int maxActiveUpgrades = 5; var versions = new OsVersions(tester.nodeRepository(), new DelegatingUpgrader(tester.nodeRepository(), maxActiveUpgrades)); provisionInfraApplication(totalNodes); - Supplier<NodeList> hostNodes = () -> tester.nodeRepository().list().state(Node.State.active).nodeType(NodeType.host); + Supplier<NodeList> hostNodes = () -> tester.nodeRepository().list().state(Node.State.active).hosts(); // 5 nodes have no version. The other 15 are spread across different versions var hostNodesList = hostNodes.get().asList(); @@ -140,7 +140,7 @@ public class OsVersionsTest { public void newer_upgrade_aborts_upgrade_to_stale_version() { var versions = new OsVersions(tester.nodeRepository(), new DelegatingUpgrader(tester.nodeRepository(), Integer.MAX_VALUE)); provisionInfraApplication(10); - Supplier<NodeList> hostNodes = () -> tester.nodeRepository().list().nodeType(NodeType.host); + Supplier<NodeList> hostNodes = () -> tester.nodeRepository().list().hosts(); // Some nodes are targeting an older version var version1 = Version.fromString("7.1"); @@ -167,7 +167,7 @@ public class OsVersionsTest { tester.makeReadyVirtualDockerNodes(2, resources, host.hostname()); } Supplier<NodeList> hostNodes = () -> tester.nodeRepository().list() - .nodeType(NodeType.host) + .hosts() .not().state(Node.State.deprovisioned); // Target is set and upgrade started diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java index 644b2338a5a..569ca96ba5c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java @@ -1,7 +1,6 @@ // 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.provision.provisioning; -import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeList; @@ -74,7 +73,7 @@ public class AllocationVisualizer extends JPanel { // Find number of docker hosts (to calculate start, and width of each) // Draw the docker hosts - and color each container according to application AllocationSnapshot simStep = steps.get(step); - NodeList hosts = simStep.nodes.nodeType(NodeType.host); + NodeList hosts = simStep.nodes.hosts(); for (Node host : hosts) { // Paint the host |