diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-09-06 12:24:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 12:24:03 +0200 |
| commit | 8775886dc638b8f2ec739c86c14b8e081c19b137 (patch) | |
| tree | 7cbb6a1aab336ef085a55b208f88248b3ffa5644 /controller-api | |
| parent | 283a224f73010a40bc8933a6568def2f3dc0608d (diff) | |
| parent | 7ee01cf769343b2d3ccd3fe7864104aa835d8f4c (diff) | |
Merge pull request #10529 from vespa-engine/freva/use-bandwidthGbps-in-clients
Use bandwidthGbps in clients
Diffstat (limited to 'controller-api')
2 files changed, 1 insertions, 12 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java index 9a44a76b145..cf3b69ab9ce 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java @@ -88,7 +88,7 @@ public interface NodeRepository { toDouble(node.getMinCpuCores()), toDouble(node.getMinMainMemoryAvailableGb()), toDouble(node.getMinDiskAvailableGb()), - toDouble(node.getBandwidth()) / 1000, + toDouble(node.getBandwidthGbps()), toBoolean(node.getFastDisk()), toInt(node.getCost()), node.getCanonicalFlavor(), 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 05e52e46c26..d723de8ba19 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 @@ -82,8 +82,6 @@ public class NodeRepositoryNode { private Integer cost; @JsonProperty("minCpuCores") private Double minCpuCores; - @JsonProperty("bandwidth") - private Double bandwidth; @JsonProperty("bandwidthGbps") private Double bandwidthGbps; @JsonProperty("fastDisk") @@ -353,14 +351,6 @@ public class NodeRepositoryNode { this.minCpuCores = minCpuCores; } - public Double getBandwidth() { - return bandwidth; - } - - public void setBandwidth(Double bandwidth) { - this.bandwidth = bandwidth; - } - public Double getBandwidthGbps() { return bandwidthGbps; } @@ -466,7 +456,6 @@ public class NodeRepositoryNode { ", minMainMemoryAvailableGb=" + minMainMemoryAvailableGb + ", cost=" + cost + ", minCpuCores=" + minCpuCores + - ", bandwidth=" + bandwidth + ", bandwidthGbps=" + bandwidthGbps + ", fastDisk=" + fastDisk + ", description='" + description + '\'' + |