aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src
diff options
context:
space:
mode:
authorkkraune <kristian@ymail.com>2019-10-25 15:11:23 +0200
committerkkraune <kristian@ymail.com>2019-10-25 15:11:23 +0200
commit3cf87b409e8b59b8a7222ff4699f4b2c497bc7e9 (patch)
tree0c724112c2811b6b7a963239a400222739c7b2c3 /node-repository/src
parenteea05c30a59062bc7af9d3102761f1939582fd33 (diff)
use node repo disk speed as-is
Diffstat (limited to 'node-repository/src')
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java9
1 files changed, 2 insertions, 7 deletions
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,