Use docker and node resources in more tests

1 files changed, 9 insertions, 4 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 60ce73be234..f8535eda44f 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
@@ -74,12 +74,17 @@ public final class Capacity {
         return fromNodeCount(capacity, Optional.empty(), false, true);
     }
 
-    public static Capacity fromCount(int nodeCount, NodeResources flavor, boolean required, boolean canFail) {
-        return new Capacity(nodeCount, Optional.of(flavor), required, canFail, NodeType.tenant);
+    /** Create a non-required, failable capacity request */
+    public static Capacity fromCount(int nodeCount, NodeResources resources) {
+        return fromCount(nodeCount, resources, false, true);
     }
 
-    public static Capacity fromCount(int nodeCount, Optional<NodeResources> flavor, boolean required, boolean canFail) {
-        return new Capacity(nodeCount, flavor, required, canFail, NodeType.tenant);
+    public static Capacity fromCount(int nodeCount, NodeResources resources, boolean required, boolean canFail) {
+        return new Capacity(nodeCount, Optional.of(resources), required, canFail, NodeType.tenant);
+    }
+
+    public static Capacity fromCount(int nodeCount, Optional<NodeResources> resources, boolean required, boolean canFail) {
+        return new Capacity(nodeCount, resources, required, canFail, NodeType.tenant);
     }
 
     public static Capacity fromNodeCount(int nodeCount, Optional<String> flavor, boolean required, boolean canFail) {