diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 14:51:45 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 14:51:45 +0200 |
commit | cc4c668b94b84f7072a08cdd955d4716b3e00e02 (patch) | |
tree | b9eda6efe6e1733502cd1b6be4731afa33c6eb74 /config-provisioning | |
parent | a8ed8292f49c953bb0f01a2c9602d7bcda7c2244 (diff) |
Don't use legacyName
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java | 2 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java | 2 |
2 files changed, 1 insertions, 3 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 f8535eda44f..dfa9ab7f6b8 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 @@ -41,7 +41,7 @@ public final class Capacity { @Deprecated public Optional<String> flavor() { if (nodeResources().isEmpty()) return Optional.empty(); - return nodeResources.get().legacyName(); + return nodeResources.map(n -> n.toString()); } /** Returns the resources requested for each node, or empty to leave this decision to provisioning */ 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 7cac2800449..45803eefbbb 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 @@ -69,8 +69,6 @@ public class Flavor { */ public int cost() { return cost; } - public boolean isStock() { return isStock; } - /** * True if this is a configured flavor used for hosts, * false if it is a virtual flavor created on the fly from node resources |