From dd72afd224d9d4f5cc73f9dd72b4334482b73562 Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Fri, 23 Feb 2024 13:46:46 -0800
Subject: [PATCH] fixups after rebase

---
 nexus/deployment/src/blueprint_builder.rs | 12 +++++++++---
 nexus/deployment/src/synthetic.rs         |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nexus/deployment/src/blueprint_builder.rs b/nexus/deployment/src/blueprint_builder.rs
index a02943d1ce..2bd2a8497a 100644
--- a/nexus/deployment/src/blueprint_builder.rs
+++ b/nexus/deployment/src/blueprint_builder.rs
@@ -749,12 +749,14 @@ pub mod test {
         let initial_blueprint =
             BlueprintBuilder::build_initial_from_collection(
                 &system_builder.to_collection().unwrap(),
+                Generation::new(),
                 &policy,
                 "test suite",
             )
             .unwrap();
         let mut builder = BlueprintBuilder::new_based_on(
             &initial_blueprint,
+            Generation::new(),
             &policy,
             "test suite",
         )
@@ -918,9 +920,13 @@ pub mod test {
         let new_sled_id = Uuid::new_v4();
         let _ = system.sled(SledBuilder::new().id(new_sled_id)).unwrap();
         let policy = system.to_policy().unwrap();
-        let mut builder =
-            BlueprintBuilder::new_based_on(&blueprint2, &policy, "test_basic")
-                .expect("failed to create builder");
+        let mut builder = BlueprintBuilder::new_based_on(
+            &blueprint2,
+            Generation::new(),
+            &policy,
+            "test_basic",
+        )
+        .expect("failed to create builder");
         builder.sled_ensure_zone_ntp(new_sled_id).unwrap();
         let new_sled_resources = policy.sleds.get(&new_sled_id).unwrap();
         for pool_name in &new_sled_resources.zpools {
diff --git a/nexus/deployment/src/synthetic.rs b/nexus/deployment/src/synthetic.rs
index 0f133e129f..674979a28b 100644
--- a/nexus/deployment/src/synthetic.rs
+++ b/nexus/deployment/src/synthetic.rs
@@ -27,6 +27,7 @@ use omicron_common::address::NEXUS_REDUNDANCY;
 use omicron_common::address::RACK_PREFIX;
 use omicron_common::address::SLED_PREFIX;
 use omicron_common::api::external::ByteCount;
+use omicron_common::api::external::Generation;
 use std::collections::BTreeSet;
 use std::fmt::Debug;
 use std::net::Ipv4Addr;
@@ -247,6 +248,7 @@ impl SyntheticSystemBuilder {
     pub fn to_blueprint(&self, creator: &str) -> anyhow::Result<Blueprint> {
         BlueprintBuilder::build_initial_from_collection(
             &self.to_collection()?,
+            Generation::new(),
             &self.to_policy()?,
             creator,
         )