Allow node allocation by resource spec

1 files changed, 25 insertions, 24 deletions

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 684b260c98c..b71aa9976a7 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -135,13 +135,13 @@
     "methods": [
       "public int nodeCount()",
       "public java.util.Optional flavor()",
-      "public java.util.Optional flavorSpec()",
+      "public java.util.Optional nodeResources()",
       "public boolean isRequired()",
       "public boolean canFail()",
       "public com.yahoo.config.provision.NodeType type()",
       "public java.lang.String toString()",
       "public static com.yahoo.config.provision.Capacity fromNodeCount(int)",
-      "public static com.yahoo.config.provision.Capacity fromCount(int, com.yahoo.config.provision.FlavorSpec, boolean, boolean)",
+      "public static com.yahoo.config.provision.Capacity fromCount(int, com.yahoo.config.provision.NodeResources, boolean, boolean)",
       "public static com.yahoo.config.provision.Capacity fromCount(int, java.util.Optional, boolean, boolean)",
       "public static com.yahoo.config.provision.Capacity fromNodeCount(int, java.util.Optional, boolean, boolean)",
       "public static com.yahoo.config.provision.Capacity fromRequiredNodeType(com.yahoo.config.provision.NodeType)"
@@ -380,7 +380,7 @@
     ],
     "methods": [
       "public void <init>(com.yahoo.config.provisioning.FlavorsConfig$Flavor)",
-      "public void <init>(com.yahoo.config.provision.FlavorSpec)",
+      "public void <init>(com.yahoo.config.provision.NodeResources)",
       "public java.lang.String name()",
       "public int cost()",
       "public boolean isStock()",
@@ -400,33 +400,14 @@
       "public boolean satisfies(com.yahoo.config.provision.Flavor)",
       "public void freeze()",
       "public boolean isLargerThan(com.yahoo.config.provision.Flavor)",
-      "public com.yahoo.config.provision.FlavorSpec asSpec()",
+      "public boolean isConfigured()",
+      "public com.yahoo.config.provision.NodeResources resources()",
       "public int hashCode()",
       "public boolean equals(java.lang.Object)",
       "public java.lang.String toString()"
     ],
     "fields": []
   },
-  "com.yahoo.config.provision.FlavorSpec": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(double, double, double)",
-      "public double cpuCores()",
-      "public double memoryGb()",
-      "public double diskGb()",
-      "public boolean allocateByLegacyName()",
-      "public java.lang.String legacyFlavorName()",
-      "public boolean equals(java.lang.Object)",
-      "public int hashCode()",
-      "public java.lang.String toString()",
-      "public static com.yahoo.config.provision.FlavorSpec fromLegacyFlavorName(java.lang.String)"
-    ],
-    "fields": []
-  },
   "com.yahoo.config.provision.HostFilter": {
     "superClass": "java.lang.Object",
     "interfaces": [],
@@ -590,6 +571,26 @@
     ],
     "fields": []
   },
+  "com.yahoo.config.provision.NodeResources": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(double, double, double)",
+      "public double vcpu()",
+      "public double memoryGb()",
+      "public double diskGb()",
+      "public boolean allocateByLegacyName()",
+      "public java.util.Optional legacyName()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
+      "public java.lang.String toString()",
+      "public static com.yahoo.config.provision.NodeResources fromLegacyName(java.lang.String)"
+    ],
+    "fields": []
+  },
   "com.yahoo.config.provision.NodeType": {
     "superClass": "java.lang.Enum",
     "interfaces": [],