add diff, simplify some types

clients/nexus-client/Cargo.toml

@@ -8,6 +8,7 @@ license = "MPL-2.0"
 chrono.workspace = true
 futures.workspace = true
 ipnetwork.workspace = true
+nexus-types.workspace = true
 omicron-common.workspace = true
 omicron-passwords.workspace = true
 progenitor.workspace = true

clients/nexus-client/src/lib.rs

@@ -22,6 +22,10 @@ progenitor::generate_api!(
         slog::debug!(log, "client response"; "result" => ?result);
     }),
     replace = {
+        // It's kind of unfortunate to pull in such a complex and unstable type
+        // as "blueprint" this way, but we have really useful functionality
+        // (e.g., diff'ing) that's implemented on our local type.
+        Blueprint = nexus_types::deployment::Blueprint,
         Generation = omicron_common::api::external::Generation,
         Ipv4Network = ipnetwork::Ipv4Network,
         Ipv6Network = ipnetwork::Ipv6Network,

dev-tools/omdb/src/bin/omdb/nexus.rs

@@ -70,6 +70,8 @@ enum BlueprintsCommands {
     List,
     /// Show a blueprint
     Show(BlueprintIdArgs),
+    /// Diff two blueprint
+    Diff(BlueprintIdsArgs),
     /// Delete a blueprint
     Delete(BlueprintIdArgs),
     /// Set the current target blueprint
@@ -86,6 +88,14 @@ struct BlueprintIdArgs {
     blueprint_id: Uuid,
 }
 
+#[derive(Debug, Args)]
+struct BlueprintIdsArgs {
+    /// id of first blueprint
+    blueprint1_id: Uuid,
+    /// id of second blueprint
+    blueprint2_id: Uuid,
+}
+
 #[derive(Debug, Args)]
 struct BlueprintsTargetArgs {
     #[command(subcommand)]
@@ -146,6 +156,9 @@ impl NexusArgs {
             NexusCommands::Blueprints(BlueprintsArgs {
                 command: BlueprintsCommands::Show(args),
             }) => cmd_nexus_blueprints_show(&client, args).await,
+            NexusCommands::Blueprints(BlueprintsArgs {
+                command: BlueprintsCommands::Diff(args),
+            }) => cmd_nexus_blueprints_diff(&client, args).await,
             NexusCommands::Blueprints(BlueprintsArgs {
                 command: BlueprintsCommands::Delete(args),
             }) => cmd_nexus_blueprints_delete(&client, args).await,
@@ -810,6 +823,22 @@ async fn cmd_nexus_blueprints_show(
     Ok(())
 }
 
+async fn cmd_nexus_blueprints_diff(
+    client: &nexus_client::Client,
+    args: &BlueprintIdsArgs,
+) -> Result<(), anyhow::Error> {
+    let b1 = client
+        .blueprint_view(&args.blueprint1_id)
+        .await
+        .with_context(|| format!("fetching blueprint {}", args.blueprint1_id))?;
+    let b2 = client
+        .blueprint_view(&args.blueprint2_id)
+        .await
+        .with_context(|| format!("fetching blueprint {}", args.blueprint2_id))?;
+    println!("{}", b1.diff(&b2));
+    Ok(())
+}
+
 async fn cmd_nexus_blueprints_delete(
     client: &nexus_client::Client,
     args: &BlueprintIdArgs,

nexus/deployment/Cargo.toml

@@ -16,3 +16,10 @@ thiserror.workspace = true
 uuid.workspace = true
 
 omicron-workspace-hack.workspace = true
+
+[dev-dependencies]
+expectorate.workspace = true
+nexus-inventory.workspace = true
+omicron-test-utils.workspace = true
+rand.workspace = true
+sled-agent-client.workspace = true

nexus/deployment/src/blueprint_builder.rs

@@ -79,9 +79,9 @@ impl<'a> BlueprintBuilder<'a> {
         policy: &'a Policy,
         creator: &str,
     ) -> Result<Blueprint, Error> {
-        let sleds: BTreeSet<_> = policy.sleds.keys().copied().collect();
-        let omicron_zones = sleds
-            .iter()
+        let omicron_zones = policy
+            .sleds
+            .keys()
             .map(|sled_id| {
                 let zones = collection
                     .omicron_zones
@@ -114,7 +114,6 @@ impl<'a> BlueprintBuilder<'a> {
             collection.all_omicron_zones().map(|z| z.id).collect();
         Ok(Blueprint {
             id: Uuid::new_v4(),
-            sleds_in_cluster: sleds,
             omicron_zones: omicron_zones,
             zones_in_service,
             parent_blueprint_id: None,
@@ -145,9 +144,10 @@ impl<'a> BlueprintBuilder<'a> {
     /// Assemble a final [`Blueprint`] based on the contents of the builder
     pub fn build(mut self) -> Blueprint {
         // Collect the Omicron zones config for each in-service sled.
-        let sleds: BTreeSet<_> = self.policy.sleds.keys().copied().collect();
-        let omicron_zones = sleds
-            .iter()
+        let omicron_zones = self
+            .policy
+            .sleds
+            .keys()
             .map(|sled_id| {
                 // Start with self.omicron_zones, which contains entries for any
                 // sled whose zones config is changing in this blueprint.
@@ -174,7 +174,6 @@ impl<'a> BlueprintBuilder<'a> {
             .collect();
         Blueprint {
             id: Uuid::new_v4(),
-            sleds_in_cluster: sleds,
             omicron_zones: omicron_zones,
             zones_in_service: self.zones_in_service,
             parent_blueprint_id: Some(self.parent_blueprint.id),
@@ -238,7 +237,7 @@ impl<'a> BlueprintBuilder<'a> {
         let ntp_servers = self
             .parent_blueprint
             .all_omicron_zones()
-            .filter_map(|z| {
+            .filter_map(|(_, z)| {
                 if matches!(z.zone_type, OmicronZoneType::BoundaryNtp { .. }) {
                     Some(format!("{}.host.{}", z.id, DNS_ZONE))
                 } else {