From 7ee01cf769343b2d3ccd3fe7864104aa835d8f4c Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerijf@verizonmedia.com>
Date: Fri, 6 Sep 2019 09:44:39 +0200
Subject: Use bandwidthGbps in clients

---
 .../api/integration/configserver/NodeRepository.java          |  2 +-
 .../api/integration/noderepository/NodeRepositoryNode.java    | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

(limited to 'controller-api')

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 + '\'' +
-- 
cgit v1.2.3