[blippy] if mupdate override is set, check that host phase 2 is CurrentContents (#8706)

Same logic as for zones -- ensure that the desired host phase 2 contents
are set to CurrentContents.

This logic already exists within Sled Agent:

https://github.com/oxidecomputer/omicron/blob/e732a78191b4988e655ac2abb08679f616c29723/sled-agent/config-reconciler/src/ledger.rs#L462-L471

Author: sunshowers

nexus/reconfigurator/blippy/src/blippy.rs

@@ -16,6 +16,7 @@ use omicron_common::address::Ipv6Subnet;
 use omicron_common::address::SLED_PREFIX;
 use omicron_common::api::external::MacAddr;
 use omicron_common::disk::DatasetKind;
+use omicron_common::disk::M2Slot;
 use omicron_uuid_kinds::MupdateOverrideUuid;
 use omicron_uuid_kinds::SledUuid;
 use omicron_uuid_kinds::ZpoolUuid;
@@ -186,6 +187,12 @@ pub enum SledKind {
         version: BlueprintArtifactVersion,
         hash: ArtifactHash,
     },
+    MupdateOverrideWithHostPhase2Artifact {
+        mupdate_override_id: MupdateOverrideUuid,
+        slot: M2Slot,
+        version: BlueprintArtifactVersion,
+        hash: ArtifactHash,
+    },
 }
 
 impl fmt::Display for SledKind {
@@ -395,6 +402,19 @@ impl fmt::Display for SledKind {
                     zone.id,
                 )
             }
+            SledKind::MupdateOverrideWithHostPhase2Artifact {
+                mupdate_override_id,
+                slot,
+                version,
+                hash,
+            } => {
+                write!(
+                    f,
+                    "sled has remove_mupdate_override set ({mupdate_override_id}), \
+                     but host phase 2 slot {slot} image source is set to Artifact \
+                     (version {version}, hash {hash})",
+                )
+            }
         }
     }
 }

nexus/reconfigurator/blippy/src/checks.rs

@@ -8,6 +8,7 @@ use crate::blippy::SledKind;
 use nexus_sled_agent_shared::inventory::ZoneKind;
 use nexus_types::deployment::BlueprintDatasetConfig;
 use nexus_types::deployment::BlueprintDatasetDisposition;
+use nexus_types::deployment::BlueprintHostPhase2DesiredContents;
 use nexus_types::deployment::BlueprintPhysicalDiskDisposition;
 use nexus_types::deployment::BlueprintSledConfig;
 use nexus_types::deployment::BlueprintZoneConfig;
@@ -21,6 +22,8 @@ use omicron_common::address::DnsSubnet;
 use omicron_common::address::Ipv6Subnet;
 use omicron_common::address::SLED_PREFIX;
 use omicron_common::disk::DatasetKind;
+use omicron_common::disk::M2Slot;
+use omicron_uuid_kinds::MupdateOverrideUuid;
 use omicron_uuid_kinds::SledUuid;
 use omicron_uuid_kinds::ZpoolUuid;
 use std::collections::BTreeMap;
@@ -577,9 +580,21 @@ fn check_mupdate_override(blippy: &mut Blippy<'_>) {
                 }
             }
 
-            // TODO: The host phase 2 contents should be set to CurrentContents
-            // (waiting for
-            // https://github.com/oxidecomputer/omicron/issues/8542).
+            // The host phase 2 contents should be set to CurrentContents.
+            check_mupdate_override_host_phase_2_contents(
+                blippy,
+                sled_id,
+                mupdate_override_id,
+                M2Slot::A,
+                &sled.host_phase_2.slot_a,
+            );
+            check_mupdate_override_host_phase_2_contents(
+                blippy,
+                sled_id,
+                mupdate_override_id,
+                M2Slot::B,
+                &sled.host_phase_2.slot_b,
+            );
 
             // TODO: PendingMgsUpdates for this sled should be empty. Mapping
             // sled IDs to their MGS identifiers (baseboard ID) requires a map
@@ -589,6 +604,30 @@ fn check_mupdate_override(blippy: &mut Blippy<'_>) {
     }
 }
 
+fn check_mupdate_override_host_phase_2_contents(
+    blippy: &mut Blippy<'_>,
+    sled_id: SledUuid,
+    mupdate_override_id: MupdateOverrideUuid,
+    slot: M2Slot,
+    contents: &BlueprintHostPhase2DesiredContents,
+) {
+    match contents {
+        BlueprintHostPhase2DesiredContents::Artifact { version, hash } => {
+            blippy.push_sled_note(
+                sled_id,
+                Severity::Fatal,
+                SledKind::MupdateOverrideWithHostPhase2Artifact {
+                    mupdate_override_id,
+                    slot,
+                    version: version.clone(),
+                    hash: *hash,
+                },
+            );
+        }
+        BlueprintHostPhase2DesiredContents::CurrentContents => {}
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1637,7 +1676,7 @@ mod tests {
         sled.remove_mupdate_override = Some(mupdate_override_id);
 
         // Find a zone and set it to use an artifact image source.
-        let kind = {
+        let artifact_zone_kind = {
             let mut zone = sled
                 .zones
                 .iter_mut()
@@ -1661,16 +1700,60 @@ mod tests {
             }
         };
 
-        let expected_note = Note {
-            severity: Severity::Fatal,
-            kind: Kind::Sled { sled_id, kind },
+        // Also set the host phase 2 contents.
+        let host_phase_2_a_kind = {
+            let version = BlueprintArtifactVersion::Available {
+                version: ArtifactVersion::new_const("123"),
+            };
+            let hash = ArtifactHash([2u8; 32]);
+            sled.host_phase_2.slot_a =
+                BlueprintHostPhase2DesiredContents::Artifact {
+                    version: version.clone(),
+                    hash,
+                };
+            SledKind::MupdateOverrideWithHostPhase2Artifact {
+                mupdate_override_id,
+                slot: M2Slot::A,
+                version,
+                hash,
+            }
         };
 
+        let host_phase_2_b_kind = {
+            let version = BlueprintArtifactVersion::Unknown;
+            let hash = ArtifactHash([3u8; 32]);
+            sled.host_phase_2.slot_b =
+                BlueprintHostPhase2DesiredContents::Artifact {
+                    version: version.clone(),
+                    hash,
+                };
+            SledKind::MupdateOverrideWithHostPhase2Artifact {
+                mupdate_override_id,
+                slot: M2Slot::B,
+                version,
+                hash,
+            }
+        };
+
+        let expected_notes = vec![
+            Note {
+                severity: Severity::Fatal,
+                kind: Kind::Sled { sled_id, kind: artifact_zone_kind },
+            },
+            Note {
+                severity: Severity::Fatal,
+                kind: Kind::Sled { sled_id, kind: host_phase_2_a_kind },
+            },
+            Note {
+                severity: Severity::Fatal,
+                kind: Kind::Sled { sled_id, kind: host_phase_2_b_kind },
+            },
+        ];
+
         let report =
             Blippy::new(&blueprint).into_report(BlippyReportSortKey::Kind);
         eprintln!("{}", report.display());
-        assert_eq!(report.notes().len(), 1, "exactly one note expected");
-        assert_eq!(report.notes()[0], expected_note);
+        assert_eq!(report.notes(), &expected_notes);
 
         logctx.cleanup_successful();
     }