From 3cf87b409e8b59b8a7222ff4699f4b2c497bc7e9 Mon Sep 17 00:00:00 2001 From: kkraune Date: Fri, 25 Oct 2019 15:11:23 +0200 Subject: use node repo disk speed as-is --- .../hosted/provision/maintenance/CapacityCheckerTester.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'node-repository') diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java index f44bddc2b57..3a29204d2f4 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java @@ -256,14 +256,9 @@ public class CapacityCheckerTester { } NodeResources.DiskSpeed diskSpeed; - // According to @kraune, container tenants are not fuzzy about disk type - if (membership != null && nodeModel.type == NodeType.tenant && membership.cluster().type() == ClusterSpec.Type.container) { - diskSpeed = NodeResources.DiskSpeed.any; - } else { - diskSpeed = nodeModel.fastDisk ? NodeResources.DiskSpeed.fast : NodeResources.DiskSpeed.slow; - } NodeResources nr = new NodeResources(nodeModel.minCpuCores, nodeModel.minMainMemoryAvailableGb, - nodeModel.minDiskAvailableGb, nodeModel.bandwidth * 1000, diskSpeed); + nodeModel.minDiskAvailableGb, nodeModel.bandwidth * 1000, + nodeModel.fastDisk ? NodeResources.DiskSpeed.fast : NodeResources.DiskSpeed.slow); Flavor f = new Flavor(nr); Node node = nodeRepository.createNode(nodeModel.id, nodeModel.hostname, -- cgit v1.2.3