Expose firmware to inventory

oxidecomputer · May 23, 2024 · 1ee77ff · 1ee77ff
1 parent b8d74c2
commit 1ee77ff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/sled-agent/src/sled_agent.rs b/sled-agent/src/sled_agent.rs
@@ -1127,7 +1127,7 @@ impl SledAgent {
         let mut disks = vec![];
         let mut zpools = vec![];
         let all_disks = self.storage().get_latest_disks().await;
-        for (identity, variant, slot) in all_disks.iter_all() {
+        for (identity, variant, slot, _firmware) in all_disks.iter_all() {
             disks.push(crate::params::InventoryDisk {
                 identity: identity.clone(),
                 variant,

diff --git a/sled-storage/src/manager.rs b/sled-storage/src/manager.rs
@@ -820,7 +820,7 @@ impl StorageManager {
             .resources
             .disks()
             .iter_all()
-            .filter_map(|(id, _variant, _slot)| {
+            .filter_map(|(id, _variant, _slot, _firmware)| {
                 if !all_ids.contains(id) {
                     Some(id.clone())
                 } else {

diff --git a/sled-storage/src/resources.rs b/sled-storage/src/resources.rs
@@ -16,7 +16,7 @@ use omicron_common::disk::DiskIdentity;
 use omicron_uuid_kinds::ZpoolUuid;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use sled_hardware::DiskVariant;
+use sled_hardware::{DiskFirmware, DiskVariant};
 use slog::{info, o, warn, Logger};
 use std::collections::BTreeMap;
 use std::sync::Arc;
@@ -241,16 +241,17 @@ impl AllDisks {
     /// Returns an iterator over all disks, managed or not.
     pub fn iter_all(
         &self,
-    ) -> impl Iterator<Item = (&DiskIdentity, DiskVariant, i64)> {
+    ) -> impl Iterator<Item = (&DiskIdentity, DiskVariant, i64, &DiskFirmware)>
+    {
         self.values.iter().map(|(identity, disk)| match disk {
             ManagedDisk::ExplicitlyManaged(disk) => {
-                (identity, disk.variant(), disk.slot())
+                (identity, disk.variant(), disk.slot(), disk.firmware())
             }
             ManagedDisk::ImplicitlyManaged(disk) => {
-                (identity, disk.variant(), disk.slot())
+                (identity, disk.variant(), disk.slot(), disk.firmware())
             }
             ManagedDisk::Unmanaged(raw) => {
-                (identity, raw.variant(), raw.slot())
+                (identity, raw.variant(), raw.slot(), raw.firmware())
             }
         })
     }