Introduce DeclaredTest and Steps, and ParallelZones -> ParallelSteps extends Steps

1 files changed, 45 insertions, 14 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index edf83fe4475..7920b7bab78 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -204,12 +204,12 @@
       "public boolean canUpgradeAt(java.time.Instant)",
       "public boolean canChangeRevisionAt(java.time.Instant)",
       "public java.util.List zones()",
-      "public boolean deploysTo(com.yahoo.config.provision.Environment, java.util.Optional)",
+      "public boolean concerns(com.yahoo.config.provision.Environment, java.util.Optional)",
       "public java.util.Optional athenzDomain()",
       "public java.util.Optional athenzService(com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)",
       "public com.yahoo.config.application.api.Notifications notifications()",
       "public java.util.List endpoints()",
-      "public boolean includes(com.yahoo.config.provision.Environment, java.util.Optional)",
+      "public boolean deploysTo(com.yahoo.config.provision.Environment, java.util.Optional)",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()",
       "public java.lang.String toString()"
@@ -231,6 +231,22 @@
     ],
     "fields": []
   },
+  "com.yahoo.config.application.api.DeploymentSpec$DeclaredTest": {
+    "superClass": "com.yahoo.config.application.api.DeploymentSpec$Step",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.config.provision.RegionName, java.util.Optional)",
+      "public boolean concerns(com.yahoo.config.provision.Environment, java.util.Optional)",
+      "public boolean isTest()",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
+      "public java.lang.String toString()"
+    ],
+    "fields": []
+  },
   "com.yahoo.config.application.api.DeploymentSpec$DeclaredZone": {
     "superClass": "com.yahoo.config.application.api.DeploymentSpec$Step",
     "interfaces": [],
@@ -246,7 +262,8 @@
       "public java.util.Optional testerFlavor()",
       "public java.util.Optional athenzService()",
       "public java.util.List zones()",
-      "public boolean deploysTo(com.yahoo.config.provision.Environment, java.util.Optional)",
+      "public boolean concerns(com.yahoo.config.provision.Environment, java.util.Optional)",
+      "public boolean isTest()",
       "public int hashCode()",
       "public boolean equals(java.lang.Object)",
       "public java.lang.String toString()"
@@ -262,22 +279,19 @@
     "methods": [
       "public void <init>(java.time.Duration)",
       "public java.time.Duration delay()",
-      "public boolean deploysTo(com.yahoo.config.provision.Environment, java.util.Optional)",
+      "public boolean concerns(com.yahoo.config.provision.Environment, java.util.Optional)",
       "public java.lang.String toString()"
     ],
     "fields": []
   },
-  "com.yahoo.config.application.api.DeploymentSpec$ParallelZones": {
-    "superClass": "com.yahoo.config.application.api.DeploymentSpec$Step",
+  "com.yahoo.config.application.api.DeploymentSpec$ParallelSteps": {
+    "superClass": "com.yahoo.config.application.api.DeploymentSpec$Steps",
     "interfaces": [],
     "attributes": [
       "public"
     ],
     "methods": [
       "public void <init>(java.util.List)",
-      "public java.util.List zones()",
-      "public java.util.List steps()",
-      "public boolean deploysTo(com.yahoo.config.provision.Environment, java.util.Optional)",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()",
       "public java.lang.String toString()"
@@ -293,11 +307,29 @@
     ],
     "methods": [
       "public void <init>()",
-      "public final boolean deploysTo(com.yahoo.config.provision.Environment)",
-      "public abstract boolean deploysTo(com.yahoo.config.provision.Environment, java.util.Optional)",
+      "public final boolean concerns(com.yahoo.config.provision.Environment)",
+      "public abstract boolean concerns(com.yahoo.config.provision.Environment, java.util.Optional)",
       "public java.util.List zones()",
       "public java.time.Duration delay()",
-      "public java.util.List steps()"
+      "public java.util.List steps()",
+      "public boolean isTest()"
+    ],
+    "fields": []
+  },
+  "com.yahoo.config.application.api.DeploymentSpec$Steps": {
+    "superClass": "com.yahoo.config.application.api.DeploymentSpec$Step",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(java.util.List)",
+      "public java.util.List zones()",
+      "public java.util.List steps()",
+      "public boolean concerns(com.yahoo.config.provision.Environment, java.util.Optional)",
+      "public boolean equals(java.lang.Object)",
+      "public int hashCode()",
+      "public java.lang.String toString()"
     ],
     "fields": []
   },
@@ -331,7 +363,6 @@
       "public java.util.List steps()",
       "public java.util.Optional athenzDomain()",
       "public java.util.Optional athenzService()",
-      "public java.util.Optional athenzService(com.yahoo.config.provision.InstanceName, com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)",
       "public java.lang.String xmlForm()",
       "public java.util.Optional instance(com.yahoo.config.provision.InstanceName)",
       "public com.yahoo.config.application.api.DeploymentInstanceSpec requireInstance(java.lang.String)",
@@ -572,4 +603,4 @@
       "public static final com.yahoo.config.application.api.ValidationOverrides all"
     ]
   }
-}
+}
\ No newline at end of file