Merge pull request #10557 from vespa-engine/bratseth/less-legacy-flavors

Less use of legacy flavor syntax

1 files changed, 3 insertions, 1 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
index dfa9ab7f6b8..8738fd607c9 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
@@ -71,7 +71,7 @@ public final class Capacity {
 
     /** Creates this from a desired node count: The request may be satisfied with a smaller number of nodes. */
     public static Capacity fromNodeCount(int capacity) {
-        return fromNodeCount(capacity, Optional.empty(), false, true);
+        return fromCount(capacity, Optional.empty(), false, true);
     }
 
     /** Create a non-required, failable capacity request */
@@ -87,6 +87,8 @@ public final class Capacity {
         return new Capacity(nodeCount, resources, required, canFail, NodeType.tenant);
     }
 
+    // TODO: Remove after September 2019
+    @Deprecated
     public static Capacity fromNodeCount(int nodeCount, Optional<String> flavor, boolean required, boolean canFail) {
         return new Capacity(nodeCount, flavor.map(NodeResources::fromLegacyName), required, canFail, NodeType.tenant);
     }