Access flavor resources through resources()

2 files changed, 3 insertions, 1 deletions

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);
     }