Remove flavor retired concept

2 files changed, 1 insertions, 26 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 dd33cd58d1d..0d67498bd6a 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
@@ -21,7 +21,6 @@ public class Flavor {
     private final int cost;
     private final Type type;
     private final double bandwidth;
-    private final boolean retired;
 
     /** The hardware resources of this flavor */
     private NodeResources resources;
@@ -37,7 +36,6 @@ public class Flavor {
                                            flavorConfig.minDiskAvailableGb(),
                                            flavorConfig.fastDisk() ? NodeResources.DiskSpeed.fast : NodeResources.DiskSpeed.slow);
         this.bandwidth = flavorConfig.bandwidth();
-        this.retired = flavorConfig.retired();
     }
 
     /** Creates a *node* flavor from a node resources spec */
@@ -48,7 +46,6 @@ public class Flavor {
         this.cost = 0;
         this.type = Type.DOCKER_CONTAINER;
         this.bandwidth = 1;
-        this.retired = false;
         this.resources = resources;
     }
 
@@ -81,11 +78,6 @@ public class Flavor {
 
     public double getMinCpuCores() { return resources.vcpu(); }
 
-    /** Returns whether the flavor is retired */
-    public boolean isRetired() {
-        return retired;
-    }
-
     public Type getType() { return type; }
     
     /** Convenience, returns getType() == Type.DOCKER_CONTAINER */
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
index a76c50702c6..48133ade4e0 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
@@ -63,24 +63,7 @@ public class NodeFlavors {
     }
 
     private static Collection<Flavor> toFlavors(FlavorsConfig config) {
-        Map<String, Flavor> flavors = new HashMap<>();
-        // First pass, create all flavors, but do not include flavorReplacesConfig.
-        for (FlavorsConfig.Flavor flavorConfig : config.flavor()) {
-            flavors.put(flavorConfig.name(), new Flavor(flavorConfig));
-        }
-
-        // Ensure that retired flavors have a replacement
-        for (Flavor flavor : flavors.values()) {
-            if (flavor.isRetired() && !hasReplacement(flavors.values(), flavor))
-                throw new IllegalStateException(String.format("Flavor '%s' is retired, but has no replacement", flavor.name()));
-        }
-        return flavors.values();
-    }
-
-    private static boolean hasReplacement(Collection<Flavor> flavors, Flavor flavor) {
-        return flavors.stream()
-                .filter(f -> !f.equals(flavor))
-                .anyMatch(f -> f.satisfies(flavor));
+        return config.flavor().stream().map(Flavor::new).collect(Collectors.toList());
     }
 
 }