add BlueprintBuilder::build_empty()

Author: jgallagher

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

@@ -3311,10 +3311,7 @@ mod tests {
         let (opctx, datastore) = (db.opctx(), db.datastore());
 
         // Create an empty blueprint from it
-        let blueprint1 = BlueprintBuilder::build_empty_with_sleds(
-            std::iter::empty(),
-            "test",
-        );
+        let blueprint1 = BlueprintBuilder::build_empty("test");
         let authz_blueprint = authz_blueprint_from_id(blueprint1.id);
 
         // Trying to read it from the database should fail with the relevant
@@ -4039,10 +4036,7 @@ mod tests {
         // Create three blueprints:
         // * `blueprint1` has no parent
         // * `blueprint2` and `blueprint3` both have `blueprint1` as parent
-        let blueprint1 = BlueprintBuilder::build_empty_with_sleds(
-            std::iter::empty(),
-            "test1",
-        );
+        let blueprint1 = BlueprintBuilder::build_empty("test1");
         let blueprint2 = BlueprintBuilder::new_based_on(
             &logctx.log,
             &blueprint1,
@@ -4190,10 +4184,7 @@ mod tests {
         let (opctx, datastore) = (db.opctx(), db.datastore());
 
         // Create an initial blueprint and a child.
-        let blueprint1 = BlueprintBuilder::build_empty_with_sleds(
-            std::iter::empty(),
-            "test1",
-        );
+        let blueprint1 = BlueprintBuilder::build_empty("test1");
         let blueprint2 = BlueprintBuilder::new_based_on(
             &logctx.log,
             &blueprint1,

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

@@ -1197,10 +1197,7 @@ mod test {
         test_name: &str,
     ) -> BlueprintBuilder<'static> {
         static EMPTY_BLUEPRINT: LazyLock<Blueprint> = LazyLock::new(|| {
-            BlueprintBuilder::build_empty_with_sleds(
-                std::iter::empty(),
-                "EMPTY_BLUEPRINT static",
-            )
+            BlueprintBuilder::build_empty("EMPTY_BLUEPRINT static")
         });
 
         let planning_input = system

nexus/reconfigurator/execution/src/dns.rs

@@ -650,10 +650,7 @@ mod test {
     /// test blueprint_internal_dns_config(): trivial case of an empty blueprint
     #[test]
     fn test_blueprint_internal_dns_empty() {
-        let blueprint = BlueprintBuilder::build_empty_with_sleds(
-            std::iter::empty(),
-            "test-suite",
-        );
+        let blueprint = BlueprintBuilder::build_empty("test-suite");
         let blueprint_dns = blueprint_internal_dns_config(
             &blueprint,
             &IdOrdMap::new(),

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

@@ -530,6 +530,12 @@ pub struct BlueprintBuilder<'a> {
 }
 
 impl<'a> BlueprintBuilder<'a> {
+    /// Directly construct an empty blueprint: no sleds; default values for all
+    /// other fields.
+    pub fn build_empty(creator: &str) -> Blueprint {
+        Self::build_empty_with_sleds(iter::empty(), creator)
+    }
+
     /// Directly construct a `Blueprint` that contains an empty zone config for
     /// the given sleds.
     pub fn build_empty_with_sleds(

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

@@ -639,10 +639,10 @@ mod test {
         // Create a large number of blueprints (49), which we'll use to test the
         // limit (see below).
         for i in 0..49 {
-            let blueprint = BlueprintBuilder::build_empty_with_sleds(
-                std::iter::empty(),
-                &format!("test_blueprint_planner_limit blueprint {}", i),
-            );
+            let blueprint = BlueprintBuilder::build_empty(&format!(
+                "test_blueprint_planner_limit blueprint {}",
+                i
+            ));
             datastore
                 .blueprint_insert(&opctx, &blueprint)
                 .await
@@ -692,8 +692,7 @@ mod test {
 
         // Insert one more blueprint, pushing the number of blueprints to the
         // limit (50).
-        let blueprint = BlueprintBuilder::build_empty_with_sleds(
-            std::iter::empty(),
+        let blueprint = BlueprintBuilder::build_empty(
             "test_blueprint_planner_limit 50th blueprint",
         );
         datastore.blueprint_insert(&opctx, &blueprint).await.unwrap_or_else(
@@ -716,8 +715,7 @@ mod test {
         );
 
         // But manual planning should continue to work.
-        let blueprint = BlueprintBuilder::build_empty_with_sleds(
-            std::iter::empty(),
+        let blueprint = BlueprintBuilder::build_empty(
             "test_blueprint_planner_limit 51st blueprint",
         );
         datastore.blueprint_insert(&opctx, &blueprint).await.unwrap_or_else(