diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-06 09:44:39 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-06 09:44:39 +0200 |
| commit | 7ee01cf769343b2d3ccd3fe7864104aa835d8f4c (patch) | |
| tree | 0e29b65a021e6e78435155f755b5867531beeb03 /node-admin | |
| parent | dae6b8c3f6131c997b3809df535bebfa433bdb25 (diff) | |
Use bandwidthGbps in clients
Diffstat (limited to 'node-admin')
2 files changed, 2 insertions, 5 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java index 582ba3dd09c..49222222a18 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java @@ -179,7 +179,7 @@ public class RealNodeRepository implements NodeRepository { node.minCpuCores, node.minMainMemoryAvailableGb, node.minDiskAvailableGb, - node.bandwidth / 1000, + node.bandwidthGbps, node.fastDisk ? fast : slow), node.ipAddresses, node.additionalIpAddresses, @@ -198,7 +198,7 @@ public class RealNodeRepository implements NodeRepository { node.minCpuCores = resources.vcpu(); node.minMainMemoryAvailableGb = resources.memoryGb(); node.minDiskAvailableGb = resources.diskGb(); - node.bandwidth = resources.bandwidthGbps() * 1000; + node.bandwidthGbps = resources.bandwidthGbps(); node.fastDisk = resources.diskSpeed() == NodeResources.DiskSpeed.fast; }); node.type = addNode.nodeType.name(); 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 1c9615e038a..9919c3affa6 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 @@ -58,8 +58,6 @@ public class NodeRepositoryNode { public Integer failCount; @JsonProperty("fastDisk") public Boolean fastDisk; - @JsonProperty("bandwidth") - public Double bandwidth; @JsonProperty("bandwidthGbps") public Double bandwidthGbps; @JsonProperty("environment") @@ -112,7 +110,6 @@ public class NodeRepositoryNode { ", wantedFirmwareCheck=" + wantedFirmwareCheck + ", failCount=" + failCount + ", fastDisk=" + fastDisk + - ", bandwidth=" + bandwidth + ", bandwidthGbps=" + bandwidthGbps + ", environment='" + environment + '\'' + ", type='" + type + '\'' + |