summaryrefslogtreecommitdiffstats
path: root/config-provisioning/src
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-09-08 20:29:24 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-09-08 20:29:24 +0200
commit16b925abaa6576a3249e32110538ee0d5d40a8bb (patch)
tree6d1b4a6949ecd7a844731ca04fc6eaf4e6944bab /config-provisioning/src
parent7e3239f6399874bd61a92b0b72f2d5f408b447bf (diff)
Less use of legacy flavor syntax
Diffstat (limited to 'config-provisioning/src')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java4
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);
}