Access flavor resources through resources()

6 files changed, 9 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java
index f9b50d0e641..247c675680b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java
@@ -36,13 +36,13 @@ public class NodeFlavorTuning implements
 
     @Override
     public void getConfig(QrStartConfig.Builder builder) {
-        builder.jvm.availableProcessors(Math.max(2, (int)Math.ceil(flavor.getMinCpuCores())));
+        builder.jvm.availableProcessors(Math.max(2, (int)Math.ceil(flavor.resources().vcpu())));
     }
 
     @Override
     public void getConfig(ThreadpoolConfig.Builder builder) {
         // Controls max number of concurrent requests per container
-        int workerThreads = Math.max(2, (int)Math.ceil(flavor.getMinCpuCores() * threadPoolSizeFactor));
+        int workerThreads = Math.max(2, (int)Math.ceil(flavor.resources().vcpu() * threadPoolSizeFactor));
         builder.maxthreads(workerThreads);
 
         // This controls your burst handling capability.
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
index c8220071373..8c3dce4d968 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
@@ -88,7 +88,7 @@ public class StorageNode extends ContentNode implements StorServerConfig.Produce
     public void getConfig(StorFilestorConfig.Builder builder) {
         if (getHostResource() != null && getHostResource().getFlavor().isPresent()) {
             Flavor nodeFlavor = getHostResource().getFlavor().get();
-            builder.num_threads(Math.max(4, (int)nodeFlavor.getMinCpuCores()));
+            builder.num_threads(Math.max(4, (int)nodeFlavor.resources().vcpu()));
         }
         cluster.getConfig(builder);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java
index 9cea509b13b..2f0d2bcf41e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java
@@ -64,7 +64,7 @@ public class NodeFlavorTuning implements ProtonConfig.Producer {
 
     private void setHwInfo(ProtonConfig.Builder builder) {
         builder.hwinfo.disk.shared(nodeFlavor.getType().equals(Flavor.Type.DOCKER_CONTAINER));
-        builder.hwinfo.cpu.cores((int)nodeFlavor.getMinCpuCores());
+        builder.hwinfo.cpu.cores((int)nodeFlavor.resources().vcpu());
         builder.hwinfo.memory.size((long)nodeFlavor.resources().memoryGb() * GB);
         builder.hwinfo.disk.size((long)nodeFlavor.resources().diskGb() * GB);
     }
@@ -113,7 +113,7 @@ public class NodeFlavorTuning implements ProtonConfig.Producer {
     }
 
     private void tuneRequestThreads(ProtonConfig.Builder builder) {
-        int numCores = (int)Math.ceil(nodeFlavor.getMinCpuCores());
+        int numCores = (int)Math.ceil(nodeFlavor.resources().vcpu());
         builder.numsearcherthreads(numCores*threadsPerSearch);
         builder.numsummarythreads(numCores);
         builder.numthreadspersearch(threadsPerSearch);
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 6f51e28b51e..c8ec45b0ec8 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
@@ -126,6 +126,8 @@ public class Flavor {
     public double getBandwidthGbps() { return resources.bandwidthGbps(); }
 
     /** Returns the number of cores available in this flavor, not scaled for speed. */
+    // TODO: Remove after June 2020
+    @Deprecated
     public double getMinCpuCores() { return minCpuCores; }
 
     public Type getType() { return type; }
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
index 31eec77de6b..c259f31df16 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
@@ -34,7 +34,7 @@ public class NodeFlavorsTest {
         NodeFlavors nodeFlavors = new NodeFlavors(config);
         Flavor banana = nodeFlavors.getFlavor("banana").get();
         assertEquals(3, banana.cost());
-        assertEquals(10, banana.getMinCpuCores(), delta);
+        assertEquals(10, banana.resources().vcpu(), delta);
         assertEquals("10 * 1.3", 13, banana.resources().vcpu(), delta);
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
index 9d02d2907cc..e3edf394da6 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java
@@ -145,7 +145,7 @@ class NodesResponse extends HttpResponse {
         object.setString("flavor", node.flavor().name());
         node.reservedTo().ifPresent(reservedTo -> object.setString("reservedTo", reservedTo.value()));
         if (node.flavor().isConfigured())
-            object.setDouble("cpuCores", node.flavor().getMinCpuCores());
+            object.setDouble("cpuCores", node.flavor().resources().vcpu());
         NodeResourcesSerializer.toSlime(node.flavor().resources(), object.setObject("resources"));
         if (node.flavor().cost() > 0)
             object.setLong("cost", node.flavor().cost());