remove explicit blueprint arg to planner

Author: jgallagher

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

@@ -2375,7 +2375,6 @@ fn cmd_blueprint_plan(
         .context("failed to construct planning input")?;
     let planner = Planner::new_based_on(
         sim.log.clone(),
-        parent_blueprint,
         &planning_input,
         creator,
         collection,

live-tests/tests/test_nexus_add_remove.rs

@@ -294,8 +294,6 @@ async fn test_nexus_add_remove(lc: &LiveTestContext) {
     .expect("planning input");
     let planner = Planner::new_based_on(
         log.clone(),
-        // TODO john remove dup arg
-        planning_input.parent_blueprint(),
         &planning_input,
         "live test suite",
         &latest_collection,

nexus/reconfigurator/planning/src/planner.rs

@@ -175,7 +175,6 @@ pub struct Planner<'a> {
 impl<'a> Planner<'a> {
     pub fn new_based_on(
         log: Logger,
-        parent_blueprint: &'a Blueprint,
         input: &'a PlanningInput,
         creator: &str,
         // NOTE: Right now, we just assume that this is the latest inventory
@@ -185,7 +184,7 @@ impl<'a> Planner<'a> {
     ) -> anyhow::Result<Planner<'a>> {
         let mut blueprint = BlueprintBuilder::new_based_on(
             &log,
-            parent_blueprint,
+            input.parent_blueprint(),
             creator,
             rng,
         )?;

nexus/src/app/background/tasks/blueprint_planner.rs

@@ -189,7 +189,6 @@ impl BlueprintPlanner {
         // Generate a new blueprint.
         let planner = Planner::new_based_on(
             opctx.log.clone(),
-            &parent,
             &input,
             "blueprint_planner",
             &collection,

nexus/src/app/deployment.rs

@@ -189,16 +189,12 @@ impl super::Nexus {
         &self,
         opctx: &OpContext,
     ) -> CreateResult<Blueprint> {
-        let (_, parent_blueprint) =
-            self.db_datastore.blueprint_target_get_current_full(opctx).await?;
-
         let planning_context = self.blueprint_planning_context(opctx).await?;
         let inventory = planning_context.inventory.ok_or_else(|| {
             Error::internal_error("no recent inventory collection found")
         })?;
         let planner = Planner::new_based_on(
             opctx.log.clone(),
-            &parent_blueprint,
             &planning_context.planning_input,
             &planning_context.creator,
             &inventory,