aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-08-14 14:45:11 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-08-14 14:45:11 +0200
commita8ed8292f49c953bb0f01a2c9602d7bcda7c2244 (patch)
tree63f16874dec36a13c82828e4762ff6415c29e9a2 /config-model
parentec5201a3396ae573e6ace8660c24db18daad7791 (diff)
Remove handling of legacy flavor allocations
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java7
1 files changed, 3 insertions, 4 deletions
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));
}