pull in BlueprintBuilder.set_nexus_generation()

Author: davepacheco

nexus/reconfigurator/planning/src/blueprint_builder/builder.rs

@@ -353,6 +353,10 @@ pub(crate) enum Operation {
         num_datasets_expunged: usize,
         num_zones_expunged: usize,
     },
+    SetNexusGeneration {
+        current_generation: Generation,
+        new_generation: Generation,
+    },
     SetTargetReleaseMinimumGeneration {
         current_generation: Generation,
         new_generation: Generation,
@@ -465,6 +469,13 @@ impl fmt::Display for Operation {
                      {current_generation} to {new_generation}"
                 )
             }
+            Self::SetNexusGeneration { current_generation, new_generation } => {
+                write!(
+                    f,
+                    "updated nexus generation from \
+                     {current_generation} to {new_generation}"
+                )
+            }
         }
     }
 }
@@ -2187,6 +2198,22 @@ impl<'a> BlueprintBuilder<'a> {
         Ok(())
     }
 
+    /// Get the value of `nexus_generation`.
+    pub fn nexus_generation(&self) -> Generation {
+        self.nexus_generation
+    }
+
+    /// Given the current value of `nexus_generation`, set the new value for
+    /// this blueprint.
+    pub fn set_nexus_generation(&mut self, new_generation: Generation) {
+        let current_generation = self.nexus_generation;
+        self.nexus_generation = new_generation;
+        self.record_operation(Operation::SetNexusGeneration {
+            current_generation,
+            new_generation,
+        });
+    }
+
     /// Allow a test to manually add an external DNS address, which could
     /// ordinarily only come from RSS.
     ///

nexus/tests/integration_tests/quiesce.rs

@@ -60,14 +60,10 @@ async fn test_quiesce(cptestctx: &ControlPlaneTestContext) {
         .map_or_else(PlannerChickenSwitches::default, |cs| {
             cs.switches.planner_switches
         });
-    let planning_input = PlanningInputFromDb::assemble(
-        &opctx,
-        &datastore,
-        chicken_switches,
-        None,
-    )
-    .await
-    .expect("planning input");
+    let planning_input =
+        PlanningInputFromDb::assemble(&opctx, &datastore, chicken_switches)
+            .await
+            .expect("planning input");
     let target_blueprint = nexus
         .blueprint_target_view(&opctx)
         .await
@@ -88,12 +84,7 @@ async fn test_quiesce(cptestctx: &ControlPlaneTestContext) {
         PlannerRng::from_entropy(),
     )
     .expect("creating BlueprintBuilder");
-    builder
-        .set_nexus_generation(
-            blueprint1.nexus_generation,
-            blueprint1.nexus_generation.next(),
-        )
-        .expect("failed to set blueprint's Nexus generation");
+    builder.set_nexus_generation(blueprint1.nexus_generation.next());
     let blueprint2 = builder.build();
     nexus
         .blueprint_import(&opctx, blueprint2.clone())