diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2019-08-29 09:46:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-29 09:46:09 +0200 |
commit | a3f3169824355f8b9b6bd2c08c8bb3c0c449eb09 (patch) | |
tree | eadcf2911a49813cb6d7a7ad3cdab85fbc0af0e5 | |
parent | 640f1272a1800551f10b96321c82e75c41c6e54d (diff) | |
parent | 29eafe5e2a063fb97aede0f29d34304bf8131061 (diff) |
Merge pull request #10446 from vespa-engine/freva/add-bandwidth-gbps
Add bandwidthGbps
39 files changed, 57 insertions, 3 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java index 57c71720962..05e52e46c26 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java @@ -84,6 +84,8 @@ public class NodeRepositoryNode { private Double minCpuCores; @JsonProperty("bandwidth") private Double bandwidth; + @JsonProperty("bandwidthGbps") + private Double bandwidthGbps; @JsonProperty("fastDisk") private Boolean fastDisk; @JsonProperty("description") @@ -359,6 +361,14 @@ public class NodeRepositoryNode { this.bandwidth = bandwidth; } + public Double getBandwidthGbps() { + return bandwidthGbps; + } + + public void setBandwidthGbps(Double bandwidthGbps) { + this.bandwidthGbps = bandwidthGbps; + } + public Boolean getFastDisk() { return fastDisk; } @@ -457,6 +467,7 @@ public class NodeRepositoryNode { ", cost=" + cost + ", minCpuCores=" + minCpuCores + ", bandwidth=" + bandwidth + + ", bandwidthGbps=" + bandwidthGbps + ", fastDisk=" + fastDisk + ", description='" + description + '\'' + ", history=" + Arrays.toString(history) + diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java index 90d70a94144..1c9615e038a 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java @@ -60,6 +60,8 @@ public class NodeRepositoryNode { public Boolean fastDisk; @JsonProperty("bandwidth") public Double bandwidth; + @JsonProperty("bandwidthGbps") + public Double bandwidthGbps; @JsonProperty("environment") public String environment; @JsonProperty("type") @@ -111,6 +113,7 @@ public class NodeRepositoryNode { ", failCount=" + failCount + ", fastDisk=" + fastDisk + ", bandwidth=" + bandwidth + + ", bandwidthGbps=" + bandwidthGbps + ", environment='" + environment + '\'' + ", type='" + type + '\'' + ", wantedDockerImage='" + wantedDockerImage + '\'' + diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java index d59cb60e15a..5a427fffe9a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java @@ -158,9 +158,10 @@ public class NodePatcher { return node.with(node.flavor().with(node.flavor().resources().withVcpu(value.asDouble()))); case "fastDisk": return node.with(node.flavor().with(node.flavor().resources().withDiskSpeed(value.asBool() ? fast : slow))); - case "bandwidthGbps": case "bandwidth": return node.with(node.flavor().with(node.flavor().resources().withBandwidthGbps(value.asDouble() / 1000))); + case "bandwidthGbps": + return node.with(node.flavor().with(node.flavor().resources().withBandwidthGbps(value.asDouble()))); case "modelName": if (value.type() == Type.NIX) { return node.withoutModelName(); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java index 30c8097c07a..7bf3b25760c 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java @@ -242,7 +242,9 @@ public class NodesApiHandler extends LoggingRequestHandler { requiredField(inspector, "minCpuCores", Inspector::asDouble), requiredField(inspector, "minMainMemoryAvailableGb", Inspector::asDouble), requiredField(inspector, "minDiskAvailableGb", Inspector::asDouble), - requiredField(inspector, "bandwidth", Inspector::asDouble) / 1000, + inspector.field("bandwidth").valid() ? + requiredField(inspector, "bandwidth", Inspector::asDouble) / 1000 : + requiredField(inspector, "bandwidthGbps", Inspector::asDouble), requiredField(inspector, "fastDisk", Inspector::asBool) ? fast : slow)); } @@ -255,6 +257,8 @@ public class NodesApiHandler extends LoggingRequestHandler { flavor = flavor.with(flavor.resources().withDiskGb(inspector.field("minDiskAvailableGb").asDouble())); if (inspector.field("bandwidth").valid()) flavor = flavor.with(flavor.resources().withBandwidthGbps(inspector.field("bandwidth").asDouble() / 1000)); + if (inspector.field("bandwidthGbps").valid()) + flavor = flavor.with(flavor.resources().withBandwidthGbps(inspector.field("bandwidthGbps").asDouble())); if (inspector.field("fastDisk").valid()) flavor = flavor.with(flavor.resources().withDiskSpeed(inspector.field("fastDisk").asBool() ? fast : slow)); log.info("should not be here"); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java index 9c1d1a92719..e06d9df3516 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java @@ -152,7 +152,8 @@ class NodesResponse extends HttpResponse { if (node.flavor().cost() > 0) object.setLong("cost", node.flavor().cost()); object.setBool("fastDisk", node.flavor().hasFastDisk()); - object.setDouble("bandwidth", 1000 * node.flavor().getBandwidthGbps()); + object.setDouble("bandwidth", 1000 * node.flavor().getBandwidthGbps()); // TODO: Remove after all clients migrated to bandwidthGbps + object.setDouble("bandwidthGbps", node.flavor().getBandwidthGbps()); object.setString("environment", node.flavor().getType().name()); node.allocation().ifPresent(allocation -> { toSlime(allocation.owner(), object.setObject("owner")); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg1.json index 92f77c997fa..d4249d66dcc 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg1.json @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 10000.0, + "bandwidthGbps": 10.0, "environment": "BARE_METAL", "rebootGeneration": 1, "currentRebootGeneration": 0, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg2.json index d2c4e133ab7..3fda9ae7f65 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg2.json @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 10000.0, + "bandwidthGbps": 10.0, "environment": "BARE_METAL", "rebootGeneration": 1, "currentRebootGeneration": 0, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/controller1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/controller1.json index 19051e27152..2e01d8af92e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/controller1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/controller1.json @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 10000.0, + "bandwidthGbps": 10.0, "environment": "BARE_METAL", "rebootGeneration": 0, "currentRebootGeneration": 0, 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 08f8f4469ee..fe682e26d16 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 @@ -13,6 +13,7 @@ "minCpuCores": 1.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.0, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant3", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json index 09eea4113a9..44af4fd7768 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json @@ -12,6 +12,7 @@ "minCpuCores": 4.0, "fastDisk": true, "bandwidth": 20000.0, + "bandwidthGbps": 20.0, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json index 09eea4113a9..44af4fd7768 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json @@ -12,6 +12,7 @@ "minCpuCores": 4.0, "fastDisk": true, "bandwidth": 20000.0, + "bandwidthGbps": 20.0, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json index 3f20e2b0e7b..7b98e9885b4 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json @@ -12,6 +12,7 @@ "minCpuCores": 4.0, "fastDisk": true, "bandwidth": 20000.0, + "bandwidthGbps": 20.0, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json index 4f9d0a89f4e..b52e956aea4 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json @@ -12,6 +12,7 @@ "minCpuCores": 4.0, "fastDisk": true, "bandwidth": 20000.0, + "bandwidthGbps": 20.0, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json index bdfba9cc629..bd685328706 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json @@ -12,6 +12,7 @@ "minCpuCores": 4.0, "fastDisk": true, "bandwidth": 20000.0, + "bandwidthGbps": 20.0, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json index c3081480fe3..39eafd56583 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json @@ -12,6 +12,7 @@ "minCpuCores": 4.0, "fastDisk": true, "bandwidth": 20000.0, + "bandwidthGbps": 20.0, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json index b779f8127df..e7c0c50863a 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json @@ -12,6 +12,7 @@ "minCpuCores": 4.0, "fastDisk": true, "bandwidth": 20000.0, + "bandwidthGbps": 20.0, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json index 1d7daebf10a..bb5fc9b3c96 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json @@ -12,6 +12,7 @@ "minCpuCores": 4.0, "fastDisk": true, "bandwidth": 20000.0, + "bandwidthGbps": 20.0, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", 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 59477bc2e80..6d4d78a557d 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 @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 2072839aca2..8df89afb5aa 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 @@ -13,6 +13,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 e089af13632..723cbdbbe9f 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 @@ -13,6 +13,7 @@ "minCpuCores": 1.0, "fastDisk": true, "bandwidth": 300.0, + "bandwidthGbps": 0.3, "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 068dfc777b3..902796ffe69 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 @@ -12,6 +12,7 @@ "minCpuCores": 10.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 a75b2b6d745..a7f4697d2fe 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 @@ -12,6 +12,7 @@ "minCpuCores": 10.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 93adcaf0246..d579d19cf5e 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 @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 8a5cb53b545..93cde2b7f4e 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 @@ -12,6 +12,7 @@ "minCpuCores": 0.5, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 6865bd560bb..2ef4eddace0 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 @@ -13,6 +13,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 f288d560d5e..35e225f31ca 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 @@ -13,6 +13,7 @@ "minCpuCores": 1.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 6ee0ba07f06..5fb5c9a8889 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 @@ -13,6 +13,7 @@ "minCpuCores": 1.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 725c6403ff5..574d522ed19 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 @@ -13,6 +13,7 @@ "minCpuCores": 1.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 1712d02e6a5..5dc4008ed3d 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 @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 0472d1d62a4..dd0429610c1 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 @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 061967ed105..d7ca3cee851 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 @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 8f11e308615..8e83e0284db 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 @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 6aa88495010..bbcc1aa45a2 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 @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 15cc3920c10..df597b981a3 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 @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 8ec4f4e45f2..0b76704d709 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 @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 1000.0, + "bandwidthGbps": 1.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 0e87d3d67eb..8a129dee967 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 @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk": true, "bandwidth": 10000.0, + "bandwidthGbps": 10.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 465e29472d4..5daaecc6b9b 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 @@ -12,6 +12,7 @@ "minCpuCores": 64.0, "fastDisk": true, "bandwidth": 15000.0, + "bandwidthGbps": 15.0, "environment": "BARE_METAL", "rebootGeneration": 0, "currentRebootGeneration": 0, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json index 42cef1c3c83..8cc60158459 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json @@ -12,6 +12,7 @@ "minCpuCores": 2.0, "fastDisk":true, "bandwidth":0.0, + "bandwidthGbps": 0.0, "environment": "BARE_METAL", "rebootGeneration": 1, "currentRebootGeneration": 0, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json index cfd28084393..8a4fef77f0e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json @@ -12,6 +12,7 @@ "minCpuCores": 64.0, "fastDisk":true, "bandwidth": 15000.0, + "bandwidthGbps": 15.0, "environment": "BARE_METAL", "rebootGeneration": 0, "currentRebootGeneration": 0, |