1 files changed, 18 insertions, 18 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Flavor.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Flavor.java
index 0893ca75f92..1039beea7c0 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Flavor.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Flavor.java
@@ -17,6 +17,7 @@ public class Flavor {
 
     private final String name;
     private final int cost;
+    private final boolean isStock;
     private final Type type;
     private final double minCpuCores;
     private final double minMainMemoryAvailableGb;
@@ -32,6 +33,7 @@ public class Flavor {
         this.name = flavorConfig.name();
         this.replacesFlavors = new ArrayList<>();
         this.cost = flavorConfig.cost();
+        this.isStock = flavorConfig.stock();
         this.type = Type.valueOf(flavorConfig.environment());
         this.minCpuCores = flavorConfig.minCpuCores();
         this.minMainMemoryAvailableGb = flavorConfig.minMainMemoryAvailableGb();
@@ -39,6 +41,7 @@ public class Flavor {
         this.description = flavorConfig.description();
     }
 
+    /** Returns the unique identity of this flavor */
     public String name() { return name; }
 
     /**
@@ -47,26 +50,18 @@ public class Flavor {
      * @return Monthly cost in USD
      */
     public int cost() { return cost; }
+    
+    public boolean isStock() { return isStock; }
 
-    public double getMinMainMemoryAvailableGb() {
-        return minMainMemoryAvailableGb;
-    }
+    public double getMinMainMemoryAvailableGb() { return minMainMemoryAvailableGb; }
 
-    public double getMinDiskAvailableGb() {
-        return minDiskAvailableGb;
-    }
+    public double getMinDiskAvailableGb() { return minDiskAvailableGb; }
 
-    public double getMinCpuCores() {
-        return minCpuCores;
-    }
+    public double getMinCpuCores() { return minCpuCores; }
 
-    public String getDescription() {
-        return description;
-    }
+    public String getDescription() { return description; }
 
-    public Type getType() {
-        return type;
-    }
+    public Type getType() { return type; }
 
     /**
      * Returns the canonical name of this flavor - which is the name which should be used as an interface to users.
@@ -78,11 +73,16 @@ public class Flavor {
      *
      * The logic is that we can use this to capture the gritty details of configurations in exact flavor names
      * but also encourage users to refer to them by a common name by letting such flavor variants declare that they
-     * replace the canonical name we want. However, if a node replaces multiple names, it means that a former
-     * flavor distinction has become obsolete so this name becomes one of the canonical names users should refer to.
+     * replace the canonical name we want. However, if a node replaces multiple names, we have no basis for choosing one
+     * of them as the canonical, so we return the current as canonical.
      */
     public String canonicalName() {
-        return replacesFlavors.size() == 1 ? replacesFlavors.get(0).canonicalName() : name;
+        return isCanonical() ? name : replacesFlavors.get(0).canonicalName();
+    }
+    
+    /** Returns whether this is a canonical flavor */
+    public boolean isCanonical() {
+        return replacesFlavors.size() != 1;
     }
 
     /**