Include certification status in /os/v1/

1 files changed, 11 insertions, 6 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java
index 8fe2ac914ef..dd3174fce56 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java
@@ -64,13 +64,17 @@ public class OsUpgradeSchedulerTest {
         assertEquals("2022-03-01T00:05:00", formatInstant(tester.clock().instant()));
 
         // Change does not become available until certification
-        assertFalse(scheduler.changeIn(cloud, tester.clock().instant(), true).isPresent());
+        Optional<OsUpgradeScheduler.Change> change = scheduler.changeIn(cloud, tester.clock().instant(), true);
+        assertTrue(change.isPresent());
+        assertFalse(change.get().certified());
         Version systemVersion = tester.controller().readSystemVersion();
         Version olderThanSystemVersion = new Version(systemVersion.getMajor(), systemVersion.getMinor() - 1, systemVersion.getMicro());
         tester.controller().os().certify(version1, cloud, olderThanSystemVersion);
 
         // Change is now certified
-        assertEquals(version1, scheduler.changeIn(cloud, tester.clock().instant(), true).get().osVersion().version());
+        change = scheduler.changeIn(cloud, tester.clock().instant(), true);
+        assertTrue(change.isPresent() && change.get().certified());
+        assertEquals(version1, change.get().osVersion().version());
         scheduler.maintain();
         assertEquals(version0,
                      tester.controller().os().target(cloud).get().osVersion().version(),
@@ -86,8 +90,9 @@ public class OsUpgradeSchedulerTest {
 
         // Time constraints have now passed, but the current target has been pinned in the meantime
         tester.controller().os().upgradeTo(version0, cloud, false, true);
-        Optional<OsUpgradeScheduler.Change> change = scheduler.changeIn(cloud, tester.clock().instant(), true);
+        change = scheduler.changeIn(cloud, tester.clock().instant(), true);
         assertTrue(change.isPresent());
+        assertTrue(change.get().certified());
         assertEquals(-1, scheduler.maintain());
         assertEquals(version0,
                      tester.controller().os().target(cloud).get().osVersion().version(),
@@ -97,8 +102,8 @@ public class OsUpgradeSchedulerTest {
         tester.controller().os().upgradeTo(version0, cloud, false, false);
         scheduler.maintain();
         assertEquals(version1,
-                tester.controller().os().target(cloud).get().osVersion().version(),
-                "New target set");
+                     tester.controller().os().target(cloud).get().osVersion().version(),
+                     "New target set");
 
         // A few more days pass and target remains unchanged
         tester.clock().advance(Duration.ofDays(2));
@@ -167,7 +172,7 @@ public class OsUpgradeSchedulerTest {
 
         // No change yet because it hasn't been certified
         Optional<OsUpgradeScheduler.Change> nextChange = scheduler.changeIn(cloud, tester.clock().instant(), true);
-        assertFalse(nextChange.isPresent(), "No change");
+        assertFalse(nextChange.get().certified(), "No change");
 
         // Change is certified and upgrade is scheduled
         Version systemVersion = tester.controller().readSystemVersion();