diff options
27 files changed, 62 insertions, 33 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java index 27a266e76e1..d6557fdd6be 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java @@ -184,11 +184,11 @@ public class NodesSpecification { if (byteAmount.endsWith("B")) byteAmount = byteAmount.substring(0, byteAmount.length() -1); - double multiplier = 1/Math.pow(1000, 3); + double multiplier = Math.pow(1000, -3); if (byteAmount.endsWith("K")) - multiplier = 1/Math.pow(1000, 2); + multiplier = Math.pow(1000, -2); else if (byteAmount.endsWith("M")) - multiplier = 1/1000; + multiplier = Math.pow(1000, -1); else if (byteAmount.endsWith("G")) multiplier = 1; else if (byteAmount.endsWith("T")) diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index 36dc53ac87a..70e86c7b097 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -608,9 +608,11 @@ "methods": [ "public void <init>(double, double, double)", "public void <init>(double, double, double, com.yahoo.config.provision.NodeResources$DiskSpeed)", + "public void <init>(double, double, double, double, com.yahoo.config.provision.NodeResources$DiskSpeed)", "public double vcpu()", "public double memoryGb()", "public double diskGb()", + "public double bandwidthMbps()", "public com.yahoo.config.provision.NodeResources$DiskSpeed diskSpeed()", "public com.yahoo.config.provision.NodeResources withDiskSpeed(com.yahoo.config.provision.NodeResources$DiskSpeed)", "public com.yahoo.config.provision.NodeResources withVcpu(double)", diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java index 2bc70efbc15..fd0fe724809 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java @@ -20,7 +20,6 @@ public class Flavor { private final String name; private final int cost; private final Type type; - private final double bandwidth; /** The hardware resources of this flavor */ private NodeResources resources; @@ -34,8 +33,8 @@ public class Flavor { this.resources = new NodeResources(flavorConfig.minCpuCores(), flavorConfig.minMainMemoryAvailableGb(), flavorConfig.minDiskAvailableGb(), + flavorConfig.bandwidth(), flavorConfig.fastDisk() ? NodeResources.DiskSpeed.fast : NodeResources.DiskSpeed.slow); - this.bandwidth = flavorConfig.bandwidth(); } /** Creates a *node* flavor from a node resources spec */ @@ -45,7 +44,6 @@ public class Flavor { this.name = resources.toString(); this.cost = 0; this.type = Type.DOCKER_CONTAINER; - this.bandwidth = 1; this.resources = resources; } @@ -74,7 +72,7 @@ public class Flavor { public boolean hasFastDisk() { return resources.diskSpeed() == NodeResources.DiskSpeed.fast; } - public double getBandwidth() { return bandwidth; } + public double getBandwidth() { return resources.bandwidthMbps(); } public double getMinCpuCores() { return resources.vcpu(); } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java index 8ef48f7048f..3a945a95812 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java @@ -1,6 +1,7 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.provision; +import java.util.Objects; import java.util.Optional; /** @@ -19,31 +20,39 @@ public class NodeResources { private final double vcpu; private final double memoryGb; private final double diskGb; + private final double bandwidthMbps; private final DiskSpeed diskSpeed; - /** Create node resources requiring fast disk */ + /** Create node resources requiring fast disk and no bandwidth */ public NodeResources(double vcpu, double memoryGb, double diskGb) { - this(vcpu, memoryGb, diskGb, DiskSpeed.fast); + this(vcpu, memoryGb, diskGb, 0, DiskSpeed.fast); } + /** Create node resources requiring no bandwidth */ public NodeResources(double vcpu, double memoryGb, double diskGb, DiskSpeed diskSpeed) { + this(vcpu, memoryGb, diskGb, 0, diskSpeed); + } + + public NodeResources(double vcpu, double memoryGb, double diskGb, double bandwidthMbps, DiskSpeed diskSpeed) { this.vcpu = vcpu; this.memoryGb = memoryGb; this.diskGb = diskGb; + this.bandwidthMbps = bandwidthMbps; this.diskSpeed = diskSpeed; } public double vcpu() { return vcpu; } public double memoryGb() { return memoryGb; } public double diskGb() { return diskGb; } + public double bandwidthMbps() { return bandwidthMbps; } public DiskSpeed diskSpeed() { return diskSpeed; } public NodeResources withDiskSpeed(DiskSpeed speed) { - return new NodeResources(vcpu, memoryGb, diskGb, speed); + return new NodeResources(vcpu, memoryGb, diskGb, bandwidthMbps, speed); } public NodeResources withVcpu(double vcpu) { - return new NodeResources(vcpu, memoryGb, diskGb, diskSpeed); + return new NodeResources(vcpu, memoryGb, diskGb, bandwidthMbps, diskSpeed); } public NodeResources subtract(NodeResources other) { @@ -52,6 +61,7 @@ public class NodeResources { return new NodeResources(vcpu - other.vcpu, memoryGb - other.memoryGb, diskGb - other.diskGb, + bandwidthMbps - other.bandwidthMbps, combine(this.diskSpeed, other.diskSpeed)); } @@ -61,6 +71,7 @@ public class NodeResources { return new NodeResources(vcpu + other.vcpu, memoryGb + other.memoryGb, diskGb + other.diskGb, + bandwidthMbps + other.bandwidthMbps, combine(this.diskSpeed, other.diskSpeed)); } @@ -93,18 +104,20 @@ public class NodeResources { if (this.vcpu != other.vcpu) return false; if (this.memoryGb != other.memoryGb) return false; if (this.diskGb != other.diskGb) return false; + if (this.bandwidthMbps != other.bandwidthMbps) return false; if (this.diskSpeed != other.diskSpeed) return false; return true; } @Override public int hashCode() { - return (int)(2503 * vcpu + 22123 * memoryGb + 26987 * diskGb + diskSpeed.hashCode()); + return Objects.hash(vcpu, memoryGb, diskGb, bandwidthMbps, diskSpeed); } @Override public String toString() { return "[vcpu: " + vcpu + ", memory: " + memoryGb + " Gb, disk " + diskGb + " Gb" + + (bandwidthMbps > 0 ? ", bandwidth: " + bandwidthMbps + " Mbps" : "") + (diskSpeed != DiskSpeed.fast ? ", disk speed: " + diskSpeed : "") + "]"; } @@ -113,6 +126,7 @@ public class NodeResources { if (this.vcpu < other.vcpu) return false; if (this.memoryGb < other.memoryGb) return false; if (this.diskGb < other.diskGb) return false; + if (this.bandwidthMbps < other.bandwidthMbps) return false; // Why doesn't a fast disk satisfy a slow disk? Because if slow disk is explicitly specified // (i.e not "any"), you should not randomly, sometimes get a faster disk as that means you may @@ -127,6 +141,7 @@ public class NodeResources { if (this.vcpu != other.vcpu) return false; if (this.memoryGb != other.memoryGb) return false; if (this.diskGb != other.diskGb) return false; + if (this.bandwidthMbps != other.bandwidthMbps) return false; if (other.diskSpeed != DiskSpeed.any && other.diskSpeed != this.diskSpeed) return false; return true; diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java index 9fcee6b60ed..db5f0ca94ed 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java @@ -52,6 +52,7 @@ public class AllocatedHostsSerializer { private static final String vcpuKey = "vcpu"; private static final String memoryKey = "memory"; private static final String diskKey = "disk"; + private static final String bandwidthKey = "bandwidth"; private static final String diskSpeedKey = "diskSpeed"; /** Wanted version */ @@ -143,9 +144,14 @@ public class AllocatedHostsSerializer { } else if (object.field(resourcesKey).valid()) { Inspector resources = object.field(resourcesKey); + double bandwidth = Optional.of(resources.field(bandwidthKey)) + .filter(Inspector::valid) + .map(Inspector::asDouble) + .orElse(0d); return Optional.of(new Flavor(new NodeResources(resources.field(vcpuKey).asDouble(), resources.field(memoryKey).asDouble(), resources.field(diskKey).asDouble(), + bandwidth, diskSpeedFromSlime(resources.field(diskSpeedKey))))); } else { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java index 6198183be89..0b90da860d3 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java @@ -85,6 +85,7 @@ public class NodeSerializer { private static final String vcpuKey = "vcpu"; private static final String memoryKey = "memory"; private static final String diskKey = "disk"; + private static final String bandwidthKey = "bandwidth"; private static final String diskSpeedKey = "diskSpeed"; // Allocation fields @@ -232,9 +233,16 @@ public class NodeSerializer { } else { Inspector resources = object.field(resourcesKey); + + // TODO: Simplify Sept. 2019 + double bandwidth = Optional.of(resources.field(bandwidthKey)) + .filter(Inspector::valid) + .map(Inspector::asDouble) + .orElse(0d); return new Flavor(new NodeResources(resources.field(vcpuKey).asDouble(), resources.field(memoryKey).asDouble(), resources.field(diskKey).asDouble(), + bandwidth, diskSpeedFromSlime(resources.field(diskSpeedKey)))); } } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-container1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-container1.json index 253cfb1b225..7540f7065dc 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-container1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-container1.json @@ -12,7 +12,7 @@ "minMainMemoryAvailableGb": 1.0, "minCpuCores": 1.0, "fastDisk": true, - "bandwidth":1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant3", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json index bb3a6b6b672..c7c8a26c331 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 8.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant1", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json index 6fc53c49e0b..8cca8e910c2 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node10.json @@ -12,7 +12,7 @@ "minMainMemoryAvailableGb": 8.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant1", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json index c9cff9673b8..9ea0fdcbfe5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node11.json @@ -12,7 +12,7 @@ "minMainMemoryAvailableGb": 1.0, "minCpuCores": 1.0, "fastDisk": true, - "bandwidth":1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "rebootGeneration": 0, "currentRebootGeneration": 0, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node13.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node13.json index e792aa518d4..d9d26ece91f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node13.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node13.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 48.0, "minCpuCores": 10.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant4", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node14.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node14.json index aca98bb36fe..56a3a75161d 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node14.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node14.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 48.0, "minCpuCores": 10.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant4", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json index 8d2f6da9d79..fe651e4fcc2 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 8.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant2", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json index ec15ccc107e..10439678650 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 48.0, "minCpuCores": 0.5, "fastDisk": true, - "bandwidth":1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "rebootGeneration": 1, "currentRebootGeneration": 0, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json index f0c937d20f3..63773027a42 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json @@ -12,7 +12,7 @@ "minMainMemoryAvailableGb": 8.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth":0.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant3", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json index 8068365e249..a9b09756020 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4.json @@ -12,7 +12,7 @@ "minMainMemoryAvailableGb": 1.0, "minCpuCores": 1.0, "fastDisk": true, - "bandwidth":1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant3", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json index 8731b7383b9..ad94495121c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5-after-changes.json @@ -12,7 +12,7 @@ "minMainMemoryAvailableGb": 1.0, "minCpuCores": 1.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "rebootGeneration": 1, "currentRebootGeneration": 0, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json index 2f5eb216af1..95fe01c90a4 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node5.json @@ -12,7 +12,7 @@ "minMainMemoryAvailableGb": 1.0, "minCpuCores": 1.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "rebootGeneration": 1, "currentRebootGeneration": 0, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json index 2c8d3625b87..197d500bcfe 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node55.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 8.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth":1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "rebootGeneration": 1, "currentRebootGeneration": 0, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json index 283bae47da1..23329ecdc1c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-after-changes.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 8.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant2", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports-2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports-2.json index 415f1094e33..f75caf08961 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports-2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports-2.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 8.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant2", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports-3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports-3.json index fdd3199b230..802e815450e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports-3.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports-3.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 8.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant2", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports.json index 1dcf068c275..8e9fea80796 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6-reports.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 8.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant2", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json index d6d9ebb4b1d..d7a16b94fb5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 8.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth": 1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant2", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json index a884b02e092..6e0d5dcf3b0 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node7.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 8.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth":1.0, + "bandwidth": 0.0, "environment": "DOCKER_CONTAINER", "rebootGeneration": 0, "currentRebootGeneration": 0, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json index e5a5c7a9520..aa471419333 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 16.0, "minCpuCores": 2.0, "fastDisk": true, - "bandwidth":0.0, + "bandwidth": 0.0, "environment": "BARE_METAL", "rebootGeneration": 0, "currentRebootGeneration": 0, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json index dad1e45c1b8..ee658e310b0 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json @@ -11,7 +11,7 @@ "minMainMemoryAvailableGb": 128.0, "minCpuCores": 64.0, "fastDisk": true, - "bandwidth":0.0, + "bandwidth": 0.0, "environment": "BARE_METAL", "rebootGeneration": 0, "currentRebootGeneration": 0, |