verify against planning input in planner/builder tests

Author: jgallagher

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

@@ -2803,9 +2803,13 @@ pub mod test {
 
     /// Checks various conditions that should be true for all blueprints
     #[track_caller]
-    pub fn verify_blueprint(blueprint: &Blueprint) {
-        let blippy_report =
-            Blippy::new(blueprint).into_report(BlippyReportSortKey::Kind);
+    pub fn verify_blueprint(
+        blueprint: &Blueprint,
+        planning_input: &PlanningInput,
+    ) {
+        let blippy_report = Blippy::new(blueprint)
+            .check_against_planning_input(planning_input)
+            .into_report(BlippyReportSortKey::Kind);
         if !blippy_report.notes().is_empty() {
             eprintln!("{}", blueprint.display());
             eprintln!("---");
@@ -2824,7 +2828,7 @@ pub mod test {
             rng.next_system_rng(),
         )
         .build();
-        verify_blueprint(&blueprint1);
+        verify_blueprint(&blueprint1, &example.input);
 
         let mut builder = BlueprintBuilder::new_based_on(
             &logctx.log,
@@ -2861,7 +2865,7 @@ pub mod test {
         }
 
         let blueprint2 = builder.build(BlueprintSource::Test);
-        verify_blueprint(&blueprint2);
+        verify_blueprint(&blueprint2, &example.input);
         let summary = blueprint2.diff_since_blueprint(&blueprint1);
         println!(
             "initial blueprint -> next blueprint (expected no changes):\n{}",
@@ -2910,7 +2914,7 @@ pub mod test {
         builder.sled_ensure_zone_datasets(new_sled_id).unwrap();
 
         let blueprint3 = builder.build(BlueprintSource::Test);
-        verify_blueprint(&blueprint3);
+        verify_blueprint(&blueprint3, &input);
         let summary = blueprint3.diff_since_blueprint(&blueprint2);
         println!(
             "expecting new NTP and Crucible zones:\n{}",
@@ -3005,7 +3009,7 @@ pub mod test {
         let mut rng = SimRngState::from_seed(TEST_NAME);
         let (collection, input, mut blueprint1) =
             example(&logctx.log, TEST_NAME);
-        verify_blueprint(&blueprint1);
+        verify_blueprint(&blueprint1, &input);
 
         // Mark one sled as having a desired state of decommissioned.
         let decommision_sled_id =
@@ -3057,7 +3061,7 @@ pub mod test {
         )
         .expect("created builder")
         .build(BlueprintSource::Test);
-        verify_blueprint(&blueprint2);
+        verify_blueprint(&blueprint2, &input);
 
         // We carried forward the desired state.
         assert_eq!(
@@ -3095,7 +3099,7 @@ pub mod test {
         )
         .expect("created builder")
         .build(BlueprintSource::Test);
-        verify_blueprint(&blueprint3);
+        verify_blueprint(&blueprint3, &input);
         assert_eq!(
             blueprint3.sleds.get(&decommision_sled_id).map(|c| c.state),
             Some(SledState::Decommissioned),
@@ -3221,7 +3225,7 @@ pub mod test {
         // `sled_ensure_datasets`.
         //
         // Verify that it has created the datasets we expect to exist.
-        verify_blueprint(&blueprint);
+        verify_blueprint(&blueprint, &input);
 
         let mut builder = BlueprintBuilder::new_based_on(
             &logctx.log,
@@ -3276,7 +3280,7 @@ pub mod test {
         assert_eq!(r, EnsureMultiple::NotNeeded);
 
         let blueprint = builder.build(BlueprintSource::Test);
-        verify_blueprint(&blueprint);
+        verify_blueprint(&blueprint, &input);
 
         let mut builder = BlueprintBuilder::new_based_on(
             &logctx.log,
@@ -3294,7 +3298,7 @@ pub mod test {
         assert_eq!(r, EnsureMultiple::NotNeeded);
 
         let blueprint = builder.build(BlueprintSource::Test);
-        verify_blueprint(&blueprint);
+        verify_blueprint(&blueprint, &input);
 
         // Find the datasets we've expunged in the blueprint
         let expunged_datasets = blueprint
@@ -3636,7 +3640,7 @@ pub mod test {
         builder.sled_ensure_zone_datasets(target_sled_id).unwrap();
 
         let blueprint = builder.build(BlueprintSource::Test);
-        verify_blueprint(&blueprint);
+        verify_blueprint(&blueprint, &input);
         assert_eq!(
             blueprint
                 .all_omicron_zones(BlueprintZoneDisposition::is_in_service)

nexus/reconfigurator/planning/src/planner.rs

@@ -2560,7 +2560,7 @@ pub(crate) mod test {
         .expect("created planner");
         let child_blueprint =
             planner.plan().expect("planning should have succeded");
-        verify_blueprint(&child_blueprint);
+        verify_blueprint(&child_blueprint, &input);
         let summary = child_blueprint.diff_since_blueprint(&blueprint);
         eprintln!(
             "diff between blueprints (expected no changes):\n{}",
@@ -2584,7 +2584,7 @@ pub(crate) mod test {
             rng.next_system_rng(),
         )
         .build();
-        verify_blueprint(&blueprint1);
+        verify_blueprint(&blueprint1, &example.input);
 
         let input = example
             .system
@@ -2624,7 +2624,7 @@ pub(crate) mod test {
         assert_eq!(summary.total_datasets_added(), 0);
         assert_eq!(summary.total_datasets_removed(), 0);
         assert_eq!(summary.total_datasets_modified(), 0);
-        verify_blueprint(&blueprint2);
+        verify_blueprint(&blueprint2, &input);
 
         // Now add a new sled.
         let mut sled_id_rng = rng.next_sled_id_rng();
@@ -2673,7 +2673,7 @@ pub(crate) mod test {
         ));
         assert_eq!(summary.diff.sleds.removed.len(), 0);
         assert_eq!(summary.diff.sleds.modified().count(), 0);
-        verify_blueprint(&blueprint3);
+        verify_blueprint(&blueprint3, &input);
 
         // Check that with no change in inventory, the planner makes no changes.
         // It needs to wait for inventory to reflect the new NTP zone before
@@ -2694,7 +2694,7 @@ pub(crate) mod test {
         assert_eq!(summary.diff.sleds.added.len(), 0);
         assert_eq!(summary.diff.sleds.removed.len(), 0);
         assert_eq!(summary.diff.sleds.modified().count(), 0);
-        verify_blueprint(&blueprint4);
+        verify_blueprint(&blueprint4, &input);
 
         // Now update the inventory to have the requested NTP zone.
         //
@@ -2756,7 +2756,7 @@ pub(crate) mod test {
                 panic!("unexpectedly added a non-Crucible zone: {zone:?}");
             }
         }
-        verify_blueprint(&blueprint5);
+        verify_blueprint(&blueprint5, &input);
 
         // Check that there are no more steps.
         assert_planning_makes_no_changes(
@@ -4912,7 +4912,7 @@ pub(crate) mod test {
         let (example, blueprint1) =
             ExampleSystemBuilder::new(&logctx.log, TEST_NAME).build();
         let mut collection = example.collection;
-        verify_blueprint(&blueprint1);
+        verify_blueprint(&blueprint1, &example.input);
 
         // We shouldn't have a clickhouse cluster config, as we don't have a
         // clickhouse policy set yet
@@ -6204,7 +6204,7 @@ pub(crate) mod test {
         .with_target_release_0_0_1()
         .expect("set target release to 0.0.1")
         .build();
-        verify_blueprint(&blueprint1);
+        verify_blueprint(&blueprint1, &example.input);
 
         // We should start with nothing to do.
         assert_planning_makes_no_changes(
@@ -6622,7 +6622,7 @@ pub(crate) mod test {
         .with_target_release_0_0_1()
         .expect("set target release to 0.0.1")
         .build();
-        verify_blueprint(&blueprint);
+        verify_blueprint(&blueprint, &example.input);
 
         // Update the example system and blueprint, as a part of test set-up.
         //
@@ -6926,7 +6926,7 @@ pub(crate) mod test {
         .with_target_release_0_0_1()
         .expect("set target release to 0.0.1")
         .build();
-        verify_blueprint(&blueprint);
+        verify_blueprint(&blueprint, &example.input);
 
         // The example system creates three internal NTP zones, and zero
         // boundary NTP zones. This is a little arbitrary, but we're checking it
@@ -7087,7 +7087,7 @@ pub(crate) mod test {
         )
         .expect("can't create planner");
         let new_blueprint = planner.plan().expect("planning succeeded");
-        verify_blueprint(&new_blueprint);
+        verify_blueprint(&new_blueprint, &example.input);
         {
             let summary = new_blueprint.diff_since_blueprint(&blueprint);
             assert_eq!(summary.total_zones_added(), 0);
@@ -7545,7 +7545,7 @@ pub(crate) mod test {
         .with_target_release_0_0_1()
         .expect("set target release to 0.0.1")
         .build();
-        verify_blueprint(&blueprint);
+        verify_blueprint(&blueprint, &example.input);
 
         // All zones should be sourced from the initial TUF repo by default.
         assert!(
@@ -7736,7 +7736,7 @@ pub(crate) mod test {
             }
             blueprint = new_blueprint;
             update_collection_from_blueprint(&mut example, &blueprint);
-            verify_blueprint(&blueprint);
+            verify_blueprint(&blueprint, &example.input);
 
             // Next blueprint: Add an (updated) internal DNS zone back
 
@@ -7762,7 +7762,7 @@ pub(crate) mod test {
             }
             blueprint = new_blueprint;
             update_collection_from_blueprint(&mut example, &blueprint);
-            verify_blueprint(&blueprint);
+            verify_blueprint(&blueprint, &example.input);
 
             assert_eq!(
                 blueprint
@@ -7822,7 +7822,7 @@ pub(crate) mod test {
         .with_target_release_0_0_1()
         .expect("set target release to 0.0.1")
         .build();
-        verify_blueprint(&blueprint1);
+        verify_blueprint(&blueprint1, &example.input);
 
         // All zones should be sourced from the 0.0.1 repo by default.
         assert!(