Expose scheduledAt in /os/v1 API

4 files changed, 7 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
index 31800fb509b..88fd3a58d23 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiHandler.java
@@ -174,6 +174,7 @@ public class OsApiHandler extends AuditLoggingRequestHandler {
             Optional<OsVersionTarget> target = targets.stream().filter(t -> t.osVersion().equals(osVersion)).findFirst();
             currentVersionObject.setBool("targetVersion", target.isPresent());
             target.ifPresent(t -> currentVersionObject.setString("upgradeBudget", t.upgradeBudget().toString()));
+            target.ifPresent(t -> currentVersionObject.setLong("scheduledAt", t.scheduledAt().toEpochMilli()));
             currentVersionObject.setString("cloud", osVersion.cloud().value());
             Cursor nodesArray = currentVersionObject.setArray("nodes");
             nodeVersions.forEach(nodeVersion -> {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java
index c9a09116263..6b6ced68b0a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java
@@ -26,6 +26,7 @@ import org.junit.Test;
 
 import java.io.File;
 import java.time.Duration;
+import java.time.Instant;
 import java.util.List;
 
 import static org.junit.Assert.assertFalse;
@@ -49,6 +50,7 @@ public class OsApiTest extends ControllerContainerTest {
     @Before
     public void before() {
         tester = new ContainerTester(container, responses);
+        tester.serviceRegistry().clock().setInstant(Instant.ofEpochMilli(1234));
         addUserToHostedOperatorRole(operator);
         zoneRegistryMock().setSystemName(SystemName.cd)
                           .setZones(zone1, zone2, zone3)
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-all-upgraded.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-all-upgraded.json
index e1b70c780c5..a5af4f45370 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-all-upgraded.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-all-upgraded.json
@@ -4,6 +4,7 @@
       "version": "7.5.2",
       "targetVersion": true,
       "upgradeBudget": "PT0S",
+      "scheduledAt": 1234,
       "cloud": "cloud1",
       "nodes": [
         {
@@ -102,6 +103,7 @@
       "version": "8.2.1",
       "targetVersion": true,
       "upgradeBudget": "PT24H",
+      "scheduledAt": 1234,
       "cloud": "cloud2",
       "nodes": [
         {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json
index a9186a9d733..4e026a2c881 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/versions-partially-upgraded.json
@@ -56,6 +56,7 @@
       "version": "7.5.2",
       "targetVersion": true,
       "upgradeBudget": "PT0S",
+      "scheduledAt": 1234,
       "cloud": "cloud1",
       "nodes": [
         {
@@ -161,6 +162,7 @@
       "version": "8.2.1",
       "targetVersion": true,
       "upgradeBudget": "PT24H",
+      "scheduledAt": 1234,
       "cloud": "cloud2",
       "nodes": []
     }