fixup datastore tests that use blueprint builder

Author: jgallagher

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

@@ -1988,6 +1988,7 @@ mod tests {
     use nexus_reconfigurator_planning::blueprint_builder::Ensure;
     use nexus_reconfigurator_planning::blueprint_builder::EnsureMultiple;
     use nexus_reconfigurator_planning::example::example;
+    use nexus_reconfigurator_planning::planner::disks_editor::BlueprintDisksEditor;
     use nexus_types::deployment::blueprint_zone_type;
     use nexus_types::deployment::BlueprintZoneConfig;
     use nexus_types::deployment::BlueprintZoneDisposition;
@@ -2322,18 +2323,17 @@ mod tests {
             "test",
         )
         .expect("failed to create builder");
+        let mut disks_editor = BlueprintDisksEditor::new(&blueprint1);
 
         // Ensure disks on our sled
         assert_eq!(
-            builder
-                .sled_ensure_disks(
-                    new_sled_id,
-                    &planning_input
-                        .sled_lookup(SledFilter::Commissioned, new_sled_id)
-                        .unwrap()
-                        .resources,
-                )
-                .unwrap(),
+            disks_editor.sled_ensure_disks(
+                new_sled_id,
+                &planning_input
+                    .sled_lookup(SledFilter::Commissioned, new_sled_id)
+                    .unwrap()
+                    .resources,
+            ),
             EnsureMultiple::Changed {
                 added: 4,
                 updated: 0,
@@ -2360,7 +2360,7 @@ mod tests {
         let num_new_crucible_zones = new_sled_zpools.len();
         let num_new_sled_zones = num_new_ntp_zones + num_new_crucible_zones;
 
-        let blueprint2 = builder.build();
+        let blueprint2 = builder.build(disks_editor);
         let authz_blueprint2 = authz_blueprint_from_id(blueprint2.id);
 
         let diff = blueprint2.diff_since_blueprint(&blueprint1);
@@ -2514,7 +2514,7 @@ mod tests {
             "test2",
         )
         .expect("failed to create builder")
-        .build();
+        .build(BlueprintDisksEditor::new(&blueprint1));
         let blueprint3 = BlueprintBuilder::new_based_on(
             &logctx.log,
             &blueprint1,
@@ -2523,7 +2523,7 @@ mod tests {
             "test3",
         )
         .expect("failed to create builder")
-        .build();
+        .build(BlueprintDisksEditor::new(&blueprint1));
         assert_eq!(blueprint1.parent_blueprint_id, None);
         assert_eq!(blueprint2.parent_blueprint_id, Some(blueprint1.id));
         assert_eq!(blueprint3.parent_blueprint_id, Some(blueprint1.id));
@@ -2623,7 +2623,7 @@ mod tests {
             "test3",
         )
         .expect("failed to create builder")
-        .build();
+        .build(BlueprintDisksEditor::new(&blueprint3));
         assert_eq!(blueprint4.parent_blueprint_id, Some(blueprint3.id));
         datastore.blueprint_insert(&opctx, &blueprint4).await.unwrap();
         let bp4_target = BlueprintTarget {
@@ -2668,7 +2668,7 @@ mod tests {
             "test2",
         )
         .expect("failed to create builder")
-        .build();
+        .build(BlueprintDisksEditor::new(&blueprint1));
         assert_eq!(blueprint1.parent_blueprint_id, None);
         assert_eq!(blueprint2.parent_blueprint_id, Some(blueprint1.id));
 
@@ -2896,7 +2896,7 @@ mod tests {
             "test2",
         )
         .expect("failed to create builder")
-        .build();
+        .build(BlueprintDisksEditor::new(&blueprint1));
 
         // Insert both into the blueprint table.
         datastore.blueprint_insert(&opctx, &blueprint1).await.unwrap();

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

@@ -2766,6 +2766,7 @@ mod tests {
     use nexus_db_model::IncompleteNetworkInterface;
     use nexus_db_model::SledUpdate;
     use nexus_reconfigurator_planning::blueprint_builder::BlueprintBuilder;
+    use nexus_reconfigurator_planning::planner::disks_editor::BlueprintDisksEditor;
     use nexus_reconfigurator_planning::system::SledBuilder;
     use nexus_reconfigurator_planning::system::SystemDescription;
     use nexus_types::deployment::Blueprint;
@@ -3129,7 +3130,7 @@ mod tests {
                     Vec::new(),
                 )
                 .expect("added nexus to third sled");
-            builder.build()
+            builder.build(BlueprintDisksEditor::new(&bp0))
         };
         bp_insert_and_make_target(&opctx, &datastore, &bp1).await;
 
@@ -3201,7 +3202,7 @@ mod tests {
                     )
                     .expect("added nexus to third sled");
             }
-            builder.build()
+            builder.build(BlueprintDisksEditor::new(&bp2))
         };
 
         // Insert the service NIC records for all the Nexuses.

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

@@ -1827,7 +1827,7 @@ impl<'a> BlueprintZonesBuilder<'a> {
     /// Iterates over the list of Omicron zones currently configured for this
     /// sled in the blueprint that's being built, along with each zone's state
     /// in the builder.
-    pub fn current_sled_zones(
+    pub(crate) fn current_sled_zones(
         &self,
         sled_id: SledUuid,
         filter: BlueprintZoneFilter,