diff options
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java | 48 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Provisioner.java | 3 |
2 files changed, 0 insertions, 51 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 09ee25fb437..3c7a14b9496 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 @@ -40,37 +40,6 @@ public final class Capacity { ") must be divisible by the number of groups (" + resources.groups() + ")"); } - /** Returns the number of nodes requested */ - @Deprecated // TODO: Remove after April 2020 - public int nodeCount() { return min.nodes(); } - - /** Returns the number of nodes requested (across all groups), or 0 if not specified */ - @Deprecated // TODO: Remove after April 2020 - public int nodes() { return min.nodes(); } - - /** Returns the number of groups requested, or 0 if not specified */ - @Deprecated // TODO: Remove after April 2020 - public int groups() { return min.groups(); } - - /** - * The node flavor requested, or empty if no legacy flavor name has been used. - * This may be satisfied by the requested flavor or a suitable replacement. - * - * @deprecated use nodeResources instead - */ - @Deprecated // TODO: Remove after March 2020 - public Optional<String> flavor() { - if (nodeResources().isEmpty()) return Optional.empty(); - return Optional.of(min.nodeResources().toString()); - } - - /** Returns the resources requested for each node, or empty to leave this decision to provisioning */ - @Deprecated // TODO: Remove after March 2020 - public Optional<NodeResources> nodeResources() { - if (min.nodeResources() == NodeResources.unspecified) return Optional.empty(); - return Optional.of(min.nodeResources()); - } - public ClusterResources minResources() { return min; } public ClusterResources maxResources() { return max; } @@ -114,23 +83,6 @@ public final class Capacity { return new Capacity(min, max, required, canFail, NodeType.tenant); } - /** Create a non-required, failable capacity request */ - @Deprecated // TODO: Remove after April 2020 - public static Capacity fromCount(int nodes, NodeResources resources) { - return fromCount(nodes, resources, false, true); - } - - @Deprecated // TODO: Remove after April 2020 - public static Capacity fromCount(int nodes, NodeResources resources, boolean required, boolean canFail) { - return fromCount(nodes, Optional.of(resources), required, canFail); - } - - @Deprecated // TODO: Remove after April 2020 - public static Capacity fromCount(int nodes, Optional<NodeResources> resources, boolean required, boolean canFail) { - return from(new ClusterResources(nodes, 0, resources.orElse(NodeResources.unspecified)), - required, canFail, NodeType.tenant); - } - /** Creates this from a node type */ public static Capacity fromRequiredNodeType(NodeType type) { return from(new ClusterResources(0, 0, NodeResources.unspecified), true, false, type); diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Provisioner.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Provisioner.java index e308d631442..2a1528f5368 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Provisioner.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Provisioner.java @@ -24,9 +24,6 @@ public interface Provisioner { */ List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, ProvisionLogger logger); - @Deprecated // TODO: Remove after April 2020 - List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger); - /** * Activates the allocation of nodes to this application captured in the hosts argument. * |