Indicate pending runs and whether they are upgrades

2 files changed, 39 insertions, 15 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
index 2e2f318a626..894cca6f243 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiHandler.java
@@ -28,6 +28,7 @@ import com.yahoo.vespa.hosted.controller.versions.VespaVersion;
 import com.yahoo.yolean.Exceptions;
 
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.logging.Level;
@@ -168,6 +169,7 @@ public class DeploymentApiHandler extends LoggingRequestHandler {
                                                             toList())))
                   .forEach((instance, runs) -> {
                       var status = statusByInstance.get(instance);
+                      var jobsToRun = status.jobsToRun();
                       Cursor instanceObject = instancesArray.addObject();
                       instanceObject.setString("tenant", instance.tenant().value());
                       instanceObject.setString("application", instance.application().value());
@@ -186,6 +188,13 @@ public class DeploymentApiHandler extends LoggingRequestHandler {
                           jobStatus.pausedUntil().ifPresent(until -> jobObject.setLong("pausedUntil", until.toEpochMilli()));
                           jobStatus.coolingDownUntil(status.application().require(instance.instance()).change())
                                    .ifPresent(until -> jobObject.setLong("coolingDownUntil", until.toEpochMilli()));
+                          if (jobsToRun.containsKey(job)) {
+                              jobObject.setString("pending", jobsToRun.get(job).stream()
+                                                                      .allMatch(versions -> versions.sourcePlatform()
+                                                                                                    .map(versions.targetPlatform()::equals)
+                                                                                                    .orElse(true))
+                                                             ? "revision" : "upgrade");
+                          }
                       });
                       Cursor allRunsObject = instanceObject.setObject("allRuns");
                       Cursor upgradeRunsObject = instanceObject.setObject("upgradeRuns");
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
index dd953a3b6cf..3213c537d13 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
@@ -40,14 +40,17 @@
           "jobs": [
             {
               "name": "system-test",
-              "coolingDownUntil": "(ignore)"
+              "coolingDownUntil": "(ignore)",
+              "pending": "upgrade"
             },
             {
               "name": "staging-test",
-              "coolingDownUntil": "(ignore)"
+              "coolingDownUntil": "(ignore)",
+              "pending": "upgrade"
             },
             {
-              "name": "production-us-west-1"
+              "name": "production-us-west-1",
+              "pending": "upgrade"
             }
           ],
           "allRuns": {
@@ -79,13 +82,16 @@
           "upgradePolicy": "default",
           "jobs": [
             {
-              "name": "system-test"
+              "name": "system-test",
+              "pending": "upgrade"
             },
             {
-              "name": "staging-test"
+              "name": "staging-test",
+              "pending": "upgrade"
             },
             {
-              "name": "production-us-west-1"
+              "name": "production-us-west-1",
+              "pending": "upgrade"
             }
           ],
           "allRuns": {
@@ -193,14 +199,17 @@
           "jobs": [
             {
               "name": "system-test",
-              "coolingDownUntil": "(ignore)"
+              "coolingDownUntil": "(ignore)",
+              "pending": "upgrade"
             },
             {
               "name": "staging-test",
-              "coolingDownUntil": "(ignore)"
+              "coolingDownUntil": "(ignore)",
+              "pending": "upgrade"
             },
             {
-              "name": "production-us-west-1"
+              "name": "production-us-west-1",
+              "pending": "upgrade"
             }
           ],
           "allRuns": {
@@ -269,13 +278,16 @@
           "jobs": [
             {
               "name": "system-test",
-              "coolingDownUntil": "(ignore)"
+              "coolingDownUntil": "(ignore)",
+              "pending": "revision"
             },
             {
-              "name": "staging-test"
+              "name": "staging-test",
+              "pending": "revision"
             },
             {
-              "name": "production-us-west-1"
+              "name": "production-us-west-1",
+              "pending": "revision"
             }
           ],
           "allRuns": {
@@ -324,13 +336,16 @@
           "upgradePolicy": "default",
           "jobs": [
             {
-              "name": "system-test"
+              "name": "system-test",
+              "pending": "upgrade"
             },
             {
-              "name": "staging-test"
+              "name": "staging-test",
+              "pending": "upgrade"
             },
             {
-              "name": "production-us-west-1"
+              "name": "production-us-west-1",
+              "pending": "upgrade"
             }
           ],
           "allRuns": {