From a8ed8292f49c953bb0f01a2c9602d7bcda7c2244 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 14 Aug 2019 14:45:11 +0200 Subject: Remove handling of legacy flavor allocations --- .../src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'config-model') diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java index 6d0c2c6abde..3f82a668fd0 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java @@ -81,10 +81,9 @@ public class VespaModelTester { // This allows us to test index vs. name order selection when subsets of hosts are selected from a cluster // (for e.g cluster controllers and slobrok nodes) String hostname = String.format("%s-%02d", - resources.allocateByLegacyName() ? resources.legacyName().get() : "node" + - "-" + Math.round(resources.vcpu()) + - "-" + Math.round(resources.memoryGb()) + - "-" + Math.round(resources.diskGb()), + "node" + "-" + Math.round(resources.vcpu()) + + "-" + Math.round(resources.memoryGb()) + + "-" + Math.round(resources.diskGb()), count - i); hosts.add(new Host(hostname, ImmutableList.of(), flavor)); } -- cgit v1.2.3