Add methods to easily modify Flavor

1 files changed, 11 insertions, 4 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 c2b2fc2cb20..e814c272aa0 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
@@ -57,10 +57,7 @@ public class Flavor {
         this.cost = cost;
     }
 
-    public Flavor withFlavorOverrides(FlavorOverrides flavorOverrides) {
-        if (type == Type.DOCKER_CONTAINER)
-            throw new IllegalArgumentException("Cannot override flavor for docker containers");
-
+    public Flavor with(FlavorOverrides flavorOverrides) {
         if (!configured)
             throw new IllegalArgumentException("Cannot override non-configured flavor");
 
@@ -73,6 +70,16 @@ public class Flavor {
         return new Flavor(name, newResources, Optional.of(flavorOverrides), type, true, cost);
     }
 
+    public Flavor with(NodeResources resources) {
+        if (type == Type.DOCKER_CONTAINER && !configured)
+            return new Flavor(resources);
+
+        if (!resources.equals(this.resources.withDiskGb(resources.diskGb())))
+            throw new IllegalArgumentException("Can only override disk GB for configured flavor");
+
+        return with(FlavorOverrides.ofDisk(resources.diskGb()));
+    }
+
     /** Returns the unique identity of this flavor if it is configured, or the resource spec string otherwise */
     public String name() { return name; }