Blueprint planner/builder: require reason when accessing expunged zones

dev-tools/reconfigurator-cli/src/lib.rs

@@ -34,16 +34,16 @@ use nexus_reconfigurator_simulation::{
 };
 use nexus_reconfigurator_simulation::{SimStateBuilder, SimTufRepoSource};
 use nexus_reconfigurator_simulation::{SimTufRepoDescription, Simulator};
-use nexus_types::deployment::execution;
+use nexus_types::deployment::ExpectedVersion;
 use nexus_types::deployment::execution::blueprint_external_dns_config;
 use nexus_types::deployment::execution::blueprint_internal_dns_config;
 use nexus_types::deployment::{Blueprint, UnstableReconfiguratorState};
 use nexus_types::deployment::{BlueprintArtifactVersion, PendingMgsUpdate};
+use nexus_types::deployment::{BlueprintExpungedZoneAccessReason, execution};
 use nexus_types::deployment::{
     BlueprintHostPhase2DesiredContents, PlannerConfig,
 };
 use nexus_types::deployment::{BlueprintSource, SledFilter};
-use nexus_types::deployment::{BlueprintZoneDisposition, ExpectedVersion};
 use nexus_types::deployment::{
     BlueprintZoneImageSource, PendingMgsUpdateDetails,
 };
@@ -2766,9 +2766,12 @@ fn sled_with_zone(
 ) -> anyhow::Result<SledUuid> {
     let mut parent_sled_id = None;
 
-    for sled_id in builder.sled_ids_with_zones() {
+    for sled_id in builder.current_commissioned_sleds() {
         if builder
-            .current_sled_zones(sled_id, BlueprintZoneDisposition::any)
+            .current_in_service_and_expunged_sled_zones(
+                sled_id,
+                BlueprintExpungedZoneAccessReason::ReconfiguratorCli,
+            )
             .any(|z| z.id == *zone_id)
         {
             parent_sled_id = Some(sled_id);

live-tests/tests/test_nexus_add_remove.rs

@@ -93,12 +93,8 @@ async fn test_nexus_add_remove(lc: &LiveTestContext) {
             let (image_source, nexus_generation) = commissioned_sled_ids
                 .iter()
                 .find_map(|&sled_id| {
-                    builder
-                        .current_sled_zones(
-                            sled_id,
-                            BlueprintZoneDisposition::is_in_service,
-                        )
-                        .find_map(|zone| {
+                    builder.current_in_service_sled_zones(sled_id).find_map(
+                        |zone| {
                             if let BlueprintZoneType::Nexus(
                                 blueprint_zone_type::Nexus {
                                     nexus_generation,
@@ -113,7 +109,8 @@ async fn test_nexus_add_remove(lc: &LiveTestContext) {
                             } else {
                                 None
                             }
-                        })
+                        },
+                    )
                 })
                 .context(
                     "could not find in-service Nexus in parent blueprint",

nexus/db-queries/src/db/datastore/deployment.rs

@@ -3111,7 +3111,6 @@ mod tests {
     use nexus_types::deployment::BlueprintHostPhase2DesiredContents;
     use nexus_types::deployment::BlueprintHostPhase2DesiredSlots;
     use nexus_types::deployment::BlueprintPhysicalDiskDisposition;
-    use nexus_types::deployment::BlueprintZoneDisposition;
     use nexus_types::deployment::BlueprintZoneImageSource;
     use nexus_types::deployment::ExpectedActiveRotSlot;
     use nexus_types::deployment::PendingMgsUpdate;
@@ -3532,10 +3531,7 @@ mod tests {
         // Take the first two zones and set their image sources.
         {
             let zone_ids: Vec<OmicronZoneUuid> = builder
-                .current_sled_zones(
-                    new_sled_id,
-                    BlueprintZoneDisposition::is_in_service,
-                )
+                .current_in_service_sled_zones(new_sled_id)
                 .map(|zone| zone.id)
                 .take(2)
                 .collect();
@@ -3577,7 +3573,8 @@ mod tests {
         // 3. both slots set to a known version
         // 4. slot_a set to a known version; slot b set to an unknown version
         {
-            let sled_ids = builder.sled_ids_with_zones().collect::<Vec<_>>();
+            let sled_ids =
+                builder.current_commissioned_sleds().collect::<Vec<_>>();
             assert!(sled_ids.len() >= 4, "at least 4 sleds");
 
             let host_phase_2_samples = [

nexus/db-queries/src/db/datastore/deployment/external_networking.rs

@@ -1503,7 +1503,7 @@ mod tests {
         .expect("created builder");
 
         let to_expunge = builder
-            .current_zones(BlueprintZoneDisposition::is_in_service)
+            .current_in_service_zones()
             .filter_map(|(sled_id, zone)| {
                 if zone.zone_type.is_external_dns() {
                     Some((sled_id, zone.id))