Kill InterimPlanningReport

Compute the new blueprint ID up front instead.
Requires passing a PlannerRng to the initializers.

Author: plotnick

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

@@ -1565,9 +1565,9 @@ fn cmd_blueprint_plan(
         &planning_input,
         creator,
         collection,
+        rng,
     )
-    .context("creating planner")?
-    .with_rng(rng);
+    .context("creating planner")?;
 
     let blueprint = planner.plan().context("generating blueprint")?;
     let rv = format!(
@@ -1610,9 +1610,9 @@ fn cmd_blueprint_edit(
         &planning_input,
         &latest_collection,
         creator,
+        rng,
     )
     .context("creating blueprint builder")?;
-    builder.set_rng(rng);
 
     if let Some(comment) = args.comment {
         builder.comment(comment);

live-tests/tests/common/reconfigurator.rs

@@ -7,6 +7,7 @@
 use anyhow::{Context, ensure};
 use nexus_client::types::BlueprintTargetSet;
 use nexus_reconfigurator_planning::blueprint_builder::BlueprintBuilder;
+use nexus_reconfigurator_planning::planner::PlannerRng;
 use nexus_types::deployment::{Blueprint, PlanningInput};
 use nexus_types::inventory::Collection;
 use omicron_uuid_kinds::GenericUuid;
@@ -73,6 +74,7 @@ pub async fn blueprint_edit_current_target(
         &planning_input,
         &collection,
         "test-suite",
+        PlannerRng::from_entropy(),
     )
     .context("creating BlueprintBuilder")?;
 

live-tests/tests/test_nexus_add_remove.rs

@@ -16,6 +16,7 @@ use nexus_client::types::SagaState;
 use nexus_inventory::CollectionBuilder;
 use nexus_reconfigurator_planning::blueprint_builder::BlueprintBuilder;
 use nexus_reconfigurator_planning::planner::Planner;
+use nexus_reconfigurator_planning::planner::PlannerRng;
 use nexus_reconfigurator_preparation::PlanningInputFromDb;
 use nexus_sled_agent_shared::inventory::ZoneKind;
 use nexus_types::deployment::BlueprintZoneDisposition;
@@ -256,6 +257,7 @@ async fn test_nexus_add_remove(lc: &LiveTestContext) {
         &planning_input,
         "live test suite",
         &latest_collection,
+        PlannerRng::from_entropy(),
     )
     .expect("constructing planner");
     let new_blueprint = planner.plan().expect("creating blueprint");

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

@@ -2354,6 +2354,7 @@ mod tests {
     use nexus_reconfigurator_planning::blueprint_builder::EnsureMultiple;
     use nexus_reconfigurator_planning::example::ExampleSystemBuilder;
     use nexus_reconfigurator_planning::example::example;
+    use nexus_reconfigurator_planning::planner::PlannerRng;
     use nexus_types::deployment::BlueprintArtifactVersion;
     use nexus_types::deployment::BlueprintHostPhase2DesiredContents;
     use nexus_types::deployment::BlueprintHostPhase2DesiredSlots;
@@ -2742,6 +2743,7 @@ mod tests {
             &planning_input,
             &collection,
             "test",
+            PlannerRng::from_entropy(),
         )
         .expect("failed to create builder");
 
@@ -3083,6 +3085,7 @@ mod tests {
             &planning_input,
             &collection,
             "dummy",
+            PlannerRng::from_entropy(),
         )
         .expect("failed to create builder")
         .build();
@@ -3160,6 +3163,7 @@ mod tests {
             &EMPTY_PLANNING_INPUT,
             &collection,
             "test2",
+            PlannerRng::from_entropy(),
         )
         .expect("failed to create builder")
         .build();
@@ -3169,6 +3173,7 @@ mod tests {
             &EMPTY_PLANNING_INPUT,
             &collection,
             "test3",
+            PlannerRng::from_entropy(),
         )
         .expect("failed to create builder")
         .build();
@@ -3269,6 +3274,7 @@ mod tests {
             &EMPTY_PLANNING_INPUT,
             &collection,
             "test3",
+            PlannerRng::from_entropy(),
         )
         .expect("failed to create builder")
         .build();
@@ -3314,6 +3320,7 @@ mod tests {
             &EMPTY_PLANNING_INPUT,
             &collection,
             "test2",
+            PlannerRng::from_entropy(),
         )
         .expect("failed to create builder")
         .build();
@@ -3546,6 +3553,7 @@ mod tests {
             &example_system.input,
             &example_system.collection,
             &format!("{test_name}-2"),
+            PlannerRng::from_entropy(),
         )
         .expect("failed to create builder")
         .build();

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

@@ -2967,6 +2967,7 @@ mod tests {
     use nexus_db_fixed_data::vpc_subnet::NEXUS_VPC_SUBNET;
     use nexus_db_model::IncompleteNetworkInterface;
     use nexus_reconfigurator_planning::blueprint_builder::BlueprintBuilder;
+    use nexus_reconfigurator_planning::planner::PlannerRng;
     use nexus_reconfigurator_planning::system::SledBuilder;
     use nexus_reconfigurator_planning::system::SystemDescription;
     use nexus_types::deployment::Blueprint;
@@ -3315,6 +3316,7 @@ mod tests {
                 &planning_input,
                 &collection,
                 "test",
+                PlannerRng::from_entropy(),
             )
             .expect("created blueprint builder");
             for &sled_id in &sled_ids {
@@ -3399,6 +3401,7 @@ mod tests {
                 &planning_input,
                 &collection,
                 "test",
+                PlannerRng::from_entropy(),
             )
             .expect("created blueprint builder");
             for &sled_id in &sled_ids {

nexus/reconfigurator/execution/src/dns.rs

@@ -323,6 +323,7 @@ mod test {
     use nexus_inventory::now_db_precision;
     use nexus_reconfigurator_planning::blueprint_builder::BlueprintBuilder;
     use nexus_reconfigurator_planning::example::ExampleSystemBuilder;
+    use nexus_reconfigurator_planning::planner::PlannerRng;
     use nexus_reconfigurator_preparation::PlanningInputFromDb;
     use nexus_sled_agent_shared::inventory::OmicronZoneConfig;
     use nexus_sled_agent_shared::inventory::OmicronZoneImageSource;
@@ -1522,6 +1523,7 @@ mod test {
             &planning_input,
             &collection,
             "test suite",
+            PlannerRng::from_entropy(),
         )
         .unwrap();
         let sled_id =