(6/N) Add image to planning report for zones

smklein · smklein · commit c073f524509a · 2025-08-29T15:17:43.000-07:00
diff --git a/dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-external-dns-stdout b/dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-external-dns-stdout
@@ -846,7 +846,7 @@ chicken switches:
     add zones with mupdate override:   false
 
 * discretionary zones placed:
-  * 1 zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a: external_dns
+  * external_dns zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a from source install dataset
 * zone updates waiting on discretionary zones
 
 
@@ -1346,7 +1346,7 @@ chicken switches:
     add zones with mupdate override:   false
 
 * discretionary zones placed:
-  * 1 zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a: external_dns
+  * external_dns zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a from source install dataset
 * zone updates waiting on discretionary zones
 
 
diff --git a/dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-internal-dns-stdout b/dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-internal-dns-stdout
@@ -654,7 +654,7 @@ chicken switches:
     add zones with mupdate override:   false
 
 * discretionary zones placed:
-  * 1 zone on sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c: internal_dns
+  * internal_dns zone on sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c from source install dataset
 * zone updates waiting on discretionary zones
 
 
diff --git a/nexus/reconfigurator/planning/src/planner.rs b/nexus/reconfigurator/planning/src/planner.rs
@@ -1141,46 +1141,47 @@ impl<'a> Planner<'a> {
                 }
             };
 
-            let image_source =
+            let image =
                 self.image_source_for_new_zone(kind.into(), mgs_updates)?;
+            let image_source = image.clone();
             match kind {
                 DiscretionaryOmicronZone::BoundaryNtp => {
                     self.blueprint.sled_promote_internal_ntp_to_boundary_ntp(
-                        sled_id,
-                        image_source,
+                        sled_id, image,
                     )?
                 }
-                DiscretionaryOmicronZone::Clickhouse => self
-                    .blueprint
-                    .sled_add_zone_clickhouse(sled_id, image_source)?,
+                DiscretionaryOmicronZone::Clickhouse => {
+                    self.blueprint.sled_add_zone_clickhouse(sled_id, image)?
+                }
                 DiscretionaryOmicronZone::ClickhouseKeeper => self
                     .blueprint
-                    .sled_add_zone_clickhouse_keeper(sled_id, image_source)?,
+                    .sled_add_zone_clickhouse_keeper(sled_id, image)?,
                 DiscretionaryOmicronZone::ClickhouseServer => self
                     .blueprint
-                    .sled_add_zone_clickhouse_server(sled_id, image_source)?,
-                DiscretionaryOmicronZone::CockroachDb => self
-                    .blueprint
-                    .sled_add_zone_cockroachdb(sled_id, image_source)?,
+                    .sled_add_zone_clickhouse_server(sled_id, image)?,
+                DiscretionaryOmicronZone::CockroachDb => {
+                    self.blueprint.sled_add_zone_cockroachdb(sled_id, image)?
+                }
                 DiscretionaryOmicronZone::CruciblePantry => self
                     .blueprint
-                    .sled_add_zone_crucible_pantry(sled_id, image_source)?,
-                DiscretionaryOmicronZone::InternalDns => self
-                    .blueprint
-                    .sled_add_zone_internal_dns(sled_id, image_source)?,
-                DiscretionaryOmicronZone::ExternalDns => self
-                    .blueprint
-                    .sled_add_zone_external_dns(sled_id, image_source)?,
+                    .sled_add_zone_crucible_pantry(sled_id, image)?,
+                DiscretionaryOmicronZone::InternalDns => {
+                    self.blueprint.sled_add_zone_internal_dns(sled_id, image)?
+                }
+                DiscretionaryOmicronZone::ExternalDns => {
+                    self.blueprint.sled_add_zone_external_dns(sled_id, image)?
+                }
                 DiscretionaryOmicronZone::Nexus => {
-                    self.blueprint.sled_add_zone_nexus(sled_id, image_source)?
+                    self.blueprint.sled_add_zone_nexus(sled_id, image)?
+                }
+                DiscretionaryOmicronZone::Oximeter => {
+                    self.blueprint.sled_add_zone_oximeter(sled_id, image)?
                 }
-                DiscretionaryOmicronZone::Oximeter => self
-                    .blueprint
-                    .sled_add_zone_oximeter(sled_id, image_source)?,
             };
             report.discretionary_zone_placed(
                 sled_id,
                 ZoneKind::from(kind).report_str(),
+                &image_source,
             );
         }
 
diff --git a/nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_bp2.txt b/nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_bp2.txt
@@ -331,7 +331,9 @@ chicken switches:
     add zones with mupdate override:   false
 
 * discretionary zones placed:
-  * 2 zones on sled d67ce8f0-a691-4010-b414-420d82e80527: crucible_pantry, nexus
-  * 2 zones on sled fefcf4cf-f7e7-46b3-b629-058526ce440e: clickhouse, internal_dns
+  * crucible_pantry zone on sled d67ce8f0-a691-4010-b414-420d82e80527 from source install dataset
+  * nexus zone on sled d67ce8f0-a691-4010-b414-420d82e80527 from source install dataset
+  * clickhouse zone on sled fefcf4cf-f7e7-46b3-b629-058526ce440e from source install dataset
+  * internal_dns zone on sled fefcf4cf-f7e7-46b3-b629-058526ce440e from source install dataset
 * zone updates waiting on discretionary zones
 
diff --git a/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_bp2.txt b/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_bp2.txt
@@ -519,7 +519,11 @@ chicken switches:
     add zones with mupdate override:   false
 
 * discretionary zones placed:
-  * 3 zones on sled 75bc286f-2b4b-482c-9431-59272af529da: nexus, nexus, nexus
-  * 3 zones on sled affab35f-600a-4109-8ea0-34a067a4e0bc: nexus, nexus, nexus
+  * nexus zone on sled 75bc286f-2b4b-482c-9431-59272af529da from source install dataset
+  * nexus zone on sled 75bc286f-2b4b-482c-9431-59272af529da from source install dataset
+  * nexus zone on sled 75bc286f-2b4b-482c-9431-59272af529da from source install dataset
+  * nexus zone on sled affab35f-600a-4109-8ea0-34a067a4e0bc from source install dataset
+  * nexus zone on sled affab35f-600a-4109-8ea0-34a067a4e0bc from source install dataset
+  * nexus zone on sled affab35f-600a-4109-8ea0-34a067a4e0bc from source install dataset
 * zone updates waiting on discretionary zones
 
diff --git a/nexus/types/src/deployment/planning_report.rs b/nexus/types/src/deployment/planning_report.rs
@@ -528,6 +528,14 @@ pub struct PlanningAddSufficientZonesExist {
     pub num_existing: usize,
 }
 
+#[derive(
+    Clone, Debug, Deserialize, Serialize, PartialEq, Eq, Diffable, JsonSchema,
+)]
+pub struct DiscretionaryZonePlacement {
+    kind: String,
+    source: String,
+}
+
 #[derive(
     Clone, Debug, Deserialize, Serialize, PartialEq, Eq, Diffable, JsonSchema,
 )]
@@ -580,7 +588,8 @@ pub struct PlanningAddStepReport {
     /// Sled ID → kinds of discretionary zones placed there
     // TODO: make `sled_add_zone_*` methods return the added zone config
     // so that we can report it here.
-    pub discretionary_zones_placed: BTreeMap<SledUuid, Vec<String>>,
+    pub discretionary_zones_placed:
+        BTreeMap<SledUuid, Vec<DiscretionaryZonePlacement>>,
 }
 
 impl PlanningAddStepReport {
@@ -663,11 +672,22 @@ impl PlanningAddStepReport {
         &mut self,
         sled_id: SledUuid,
         zone_kind: &str,
+        image_source: &BlueprintZoneImageSource,
     ) {
         self.discretionary_zones_placed
             .entry(sled_id)
-            .and_modify(|kinds| kinds.push(zone_kind.to_owned()))
-            .or_insert_with(|| vec![zone_kind.to_owned()]);
+            .and_modify(|kinds| {
+                kinds.push(DiscretionaryZonePlacement {
+                    kind: zone_kind.to_owned(),
+                    source: image_source.to_string(),
+                })
+            })
+            .or_insert_with(|| {
+                vec![DiscretionaryZonePlacement {
+                    kind: zone_kind.to_owned(),
+                    source: image_source.to_string(),
+                }]
+            });
     }
 }
 
@@ -788,13 +808,13 @@ impl fmt::Display for PlanningAddStepReport {
 
         if !discretionary_zones_placed.is_empty() {
             writeln!(f, "* discretionary zones placed:")?;
-            for (sled_id, kinds) in discretionary_zones_placed.iter() {
-                let (n, s) = plural_vec(kinds);
-                writeln!(
-                    f,
-                    "  * {n} zone{s} on sled {sled_id}: {}",
-                    kinds.join(", ")
-                )?;
+            for (sled_id, placements) in discretionary_zones_placed.iter() {
+                for DiscretionaryZonePlacement { kind, source } in placements {
+                    writeln!(
+                        f,
+                        "  * {kind} zone on sled {sled_id} from source {source}",
+                    )?;
+                }
             }
         }
 
diff --git a/openapi/nexus-internal.json b/openapi/nexus-internal.json
@@ -4219,6 +4219,21 @@
           "saga_id"
         ]
       },
+      "DiscretionaryZonePlacement": {
+        "type": "object",
+        "properties": {
+          "kind": {
+            "type": "string"
+          },
+          "source": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "kind",
+          "source"
+        ]
+      },
       "DiskIdentity": {
         "description": "Uniquely identifies a disk.",
         "type": "object",
@@ -6756,7 +6771,7 @@
             "additionalProperties": {
               "type": "array",
               "items": {
-                "type": "string"
+                "$ref": "#/components/schemas/DiscretionaryZonePlacement"
               }
             }
           },
