Write firmwareVerified event

4 files changed, 15 insertions, 2 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
index 61d5909ce6f..fa439e50fbd 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
@@ -299,6 +299,13 @@ public final class Node {
         return this.with(newStatus).with(newHistory);
     }
 
+    /** Returns a copy of this node with firmware verified at the given instant */
+    public Node withFirmwareVerifiedAt(Instant instant) {
+        var newStatus = status.withFirmwareVerifiedAt(instant);
+        var newHistory = history.with(new History.Event(History.Event.Type.firmwareVerified, Agent.system, instant));
+        return this.with(newStatus).with(newHistory);
+    }
+
     /** Returns a copy of this node with the given history. */
     public Node with(History history) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history, type, reports, modelName);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
index 8ec21a246bc..5f4c300b496 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java
@@ -122,7 +122,7 @@ public class NodePatcher {
             case "currentOsVersion" :
                 return node.withCurrentOsVersion(Version.fromString(asString(value)), clock.instant());
             case "currentFirmwareCheck":
-                return node.with(node.status().withFirmwareVerifiedAt(Instant.ofEpochMilli(asLong(value))));
+                return node.withFirmwareVerifiedAt(Instant.ofEpochMilli(asLong(value)));
             case "failCount" :
                 return node.with(node.status().setFailCount(asLong(value).intValue()));
             case "flavor" :
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
index 60d88ad1bb4..0cfdf80a8a1 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
@@ -343,9 +343,10 @@ public class SerializationTest {
         Node node = nodeSerializer.fromJson(State.active, nodeSerializer.toJson(createNode()));
         assertFalse(node.status().firmwareVerifiedAt().isPresent());
 
-        node = node.with(node.status().withFirmwareVerifiedAt(Instant.ofEpochMilli(100)));
+        node = node.withFirmwareVerifiedAt(Instant.ofEpochMilli(100));
         node = nodeSerializer.fromJson(State.active, nodeSerializer.toJson(node));
         assertEquals(100, node.status().firmwareVerifiedAt().get().toEpochMilli());
+        assertEquals(Instant.ofEpochMilli(100), node.history().event(History.Event.Type.firmwareVerified).get().at());
     }
 
     @Test
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json
index 53982c78042..24e64248b1c 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json
@@ -57,6 +57,11 @@
       "event": "activated",
       "at": 123,
       "agent": "application"
+    },
+    {
+      "event": "firmwareVerified",
+      "at": 100,
+      "agent": "system"
     }
   ],
   "ipAddresses": [