Simplify Flavors

4 files changed, 1 insertions, 42 deletions

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 18f4d317019..b6f692e776b 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -395,14 +395,11 @@
       "public boolean isRetired()",
       "public com.yahoo.config.provision.Flavor$Type getType()",
       "public boolean isDocker()",
-      "public int getIdealHeadroom()",
       "public java.lang.String canonicalName()",
       "public boolean isCanonical()",
       "public java.util.List replaces()",
       "public boolean satisfies(com.yahoo.config.provision.Flavor)",
-      "public boolean hasAtLeast(com.yahoo.config.provision.NodeResources)",
       "public void freeze()",
-      "public boolean isLargerThan(com.yahoo.config.provision.Flavor)",
       "public int hashCode()",
       "public boolean equals(java.lang.Object)",
       "public java.lang.String toString()"
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 8667707883d..7ecab86529f 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
@@ -5,10 +5,8 @@ import com.google.common.collect.ImmutableList;
 import com.yahoo.config.provisioning.FlavorsConfig;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 
 /**
  * A host or node flavor.
@@ -29,7 +27,6 @@ public class Flavor {
     private final String description;
     private final boolean retired;
     private List<Flavor> replacesFlavors;
-    private int idealHeadroom; // Note: Not used after Vespa 6.282
 
     /** The hardware resources of this flavor */
     private NodeResources resources;
@@ -49,7 +46,6 @@ public class Flavor {
         this.description = flavorConfig.description();
         this.retired = flavorConfig.retired();
         this.replacesFlavors = new ArrayList<>();
-        this.idealHeadroom = flavorConfig.idealHeadroom();
     }
 
     /** Creates a *node* flavor from a node resources spec */
@@ -66,8 +62,7 @@ public class Flavor {
         this.bandwidth = 1;
         this.description = "";
         this.retired = false;
-        this.replacesFlavors = Collections.emptyList();
-        this.idealHeadroom = 0;
+        this.replacesFlavors = List.of();
         this.resources = resources;
     }
 
@@ -114,11 +109,6 @@ public class Flavor {
     /** Convenience, returns getType() == Type.DOCKER_CONTAINER */
     public boolean isDocker() { return type == Type.DOCKER_CONTAINER; }
 
-    /** The free capacity we would like to preserve for this flavor */
-    public int getIdealHeadroom() {
-        return idealHeadroom;
-    }
-
     /**
      * Returns the canonical name of this flavor - which is the name which should be used as an interface to users.
      * The canonical name of this flavor is:
@@ -164,23 +154,10 @@ public class Flavor {
         return false;
     }
 
-    /**
-     * Returns whether this flavor has at least the given resources, i.e if all resources of this are at least
-     * as large as the given resources.
-     */
-    public boolean hasAtLeast(NodeResources resources) {
-        return this.resources.satisfies(resources);
-    }
-
     /** Irreversibly freezes the content of this */
     public void freeze() {
         replacesFlavors = ImmutableList.copyOf(replacesFlavors);
     }
-    
-    /** Returns whether this flavor has at least as much of each hardware resource as the given flavor */
-    public boolean isLargerThan(Flavor other) {
-        return hasAtLeast(other.resources);
-    }
 
     @Override
     public int hashCode() { return name.hashCode(); }
diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/flavors.def
index 1e40f6f8f36..b765270df12 100644
--- a/config-provisioning/src/main/resources/configdefinitions/flavors.def
+++ b/config-provisioning/src/main/resources/configdefinitions/flavors.def
@@ -49,6 +49,3 @@ flavor[].description string default=""
 # The flavor is retired and should no longer be used.
 flavor[].retired bool default=false
 
-# The free capacity we would like to preserve for this flavor
-# Note: Not used after Vespa 6.282
-flavor[].idealHeadroom int default=0
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
index 81f3798a370..55ffa821e26 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java
@@ -10,9 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 
 public class NodeFlavorsTest {
@@ -59,16 +57,6 @@ public class NodeFlavorsTest {
     }
 
     @Test
-    public void testHasAtLeast() {
-        Flavor flavor = new Flavor(new NodeResources(1, 2, 3));
-        assertTrue(flavor.hasAtLeast(new NodeResources(1, 2, 3)));
-        assertTrue(flavor.hasAtLeast(new NodeResources(1, 1.5, 2)));
-        assertFalse(flavor.hasAtLeast(new NodeResources(1, 1.5, 4)));
-        assertFalse(flavor.hasAtLeast(new NodeResources(2, 1.5, 4)));
-        assertFalse(flavor.hasAtLeast(new NodeResources(1, 2.1, 4)));
-    }
-
-    @Test
     public void testRetiredFlavorWithoutReplacement() {
         FlavorsConfig.Builder builder = new FlavorsConfig.Builder();
         List<FlavorsConfig.Flavor.Builder> flavorBuilderList = new ArrayList<>();