first cut

clients/dns-service-client/src/lib.rs

@@ -5,7 +5,7 @@
 progenitor::generate_api!(
     spec = "../../openapi/dns-server.json",
     inner_type = slog::Logger,
-    derives = [schemars::JsonSchema, Eq, PartialEq],
+    derives = [schemars::JsonSchema, Clone, Eq, PartialEq],
     pre_hook = (|log: &slog::Logger, request: &reqwest::Request| {
         slog::debug!(log, "client request";
             "method" => %request.method(),

common/src/api/external/mod.rs

@@ -679,6 +679,12 @@ impl From<&Generation> for i64 {
     }
 }
 
+impl From<Generation> for u64 {
+    fn from(g: Generation) -> Self {
+        g.0
+    }
+}
+
 impl From<u32> for Generation {
     fn from(value: u32) -> Self {
         Generation(u64::from(value))

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

@@ -844,7 +844,7 @@ async fn cmd_nexus_blueprints_diff(
     let b2 = client.blueprint_view(&args.blueprint2_id).await.with_context(
         || format!("fetching blueprint {}", args.blueprint2_id),
     )?;
-    println!("{}", b1.diff(&b2));
+    println!("{}", b1.diff_sleds(&b2));
     Ok(())
 }
 

internal-dns/src/config.rs

@@ -63,9 +63,9 @@
 use crate::names::{ServiceName, DNS_ZONE};
 use anyhow::{anyhow, ensure};
 use dns_service_client::types::{DnsConfigParams, DnsConfigZone, DnsRecord};
-use omicron_common::api::internal::shared::SwitchLocation;
+use omicron_common::api::external::Generation;
 use std::collections::BTreeMap;
-use std::net::{Ipv6Addr, SocketAddrV6};
+use std::net::Ipv6Addr;
 use uuid::Uuid;
 
 /// Zones that can be referenced within the internal DNS system.
@@ -147,8 +147,6 @@ pub struct DnsConfigBuilder {
     /// network
     sleds: BTreeMap<Sled, Ipv6Addr>,
 
-    scrimlets: BTreeMap<SwitchLocation, SocketAddrV6>,
-
     /// set of hosts of type "zone" that have been configured so far, mapping
     /// each zone's unique uuid to its sole IPv6 address on the control plane
     /// network
@@ -163,6 +161,9 @@ pub struct DnsConfigBuilder {
 
     /// similar to service_instances_zones, but for services that run on sleds
     service_instances_sleds: BTreeMap<ServiceName, BTreeMap<Sled, u16>>,
+
+    /// generation number for this config
+    generation: Generation,
 }
 
 /// Describes a host of type "sled" in the control plane DNS zone
@@ -192,16 +193,17 @@ impl DnsConfigBuilder {
         DnsConfigBuilder {
             sleds: BTreeMap::new(),
             zones: BTreeMap::new(),
-            scrimlets: BTreeMap::new(),
             service_instances_zones: BTreeMap::new(),
             service_instances_sleds: BTreeMap::new(),
+            generation: Generation::new(),
         }
     }
 
     /// Add a new host of type "sled" to the configuration
     ///
-    /// Returns a [`Sled`] that can be used with [`Self::service_backend_sled()`] to
-    /// specify that this sled is a backend for some higher-level service.
+    /// Returns a [`Sled`] that can be used with
+    /// [`Self::service_backend_sled()`] to specify that this sled is a backend
+    /// for some higher-level service.
     ///
     /// # Errors
     ///
@@ -223,19 +225,11 @@ impl DnsConfigBuilder {
         }
     }
 
-    pub fn host_scrimlet(
-        &mut self,
-        switch_location: SwitchLocation,
-        addr: SocketAddrV6,
-    ) -> anyhow::Result<()> {
-        self.scrimlets.insert(switch_location, addr);
-        Ok(())
-    }
-
     /// Add a new dendrite host of type "zone" to the configuration
     ///
-    /// Returns a [`Zone`] that can be used with [`Self::service_backend_zone()`] to
-    /// specify that this zone is a backend for some higher-level service.
+    /// Returns a [`Zone`] that can be used with
+    /// [`Self::service_backend_zone()`] to specify that this zone is a backend
+    /// for some higher-level service.
     ///
     /// # Errors
     ///
@@ -251,8 +245,9 @@ impl DnsConfigBuilder {
 
     /// Add a new host of type "zone" to the configuration
     ///
-    /// Returns a [`Zone`] that can be used with [`Self::service_backend_zone()`] to
-    /// specify that this zone is a backend for some higher-level service.
+    /// Returns a [`Zone`] that can be used with
+    /// [`Self::service_backend_zone()`] to specify that this zone is a backend
+    /// for some higher-level service.
     ///
     /// # Errors
     ///
@@ -363,6 +358,52 @@ impl DnsConfigBuilder {
         }
     }
 
+    /// Higher-level shorthand for adding a zone with a single backend service
+    ///
+    /// # Errors
+    ///
+    /// This function fails only if the given zone has already been added to the
+    /// configuration.
+    pub fn host_zone_with_one_backend(
+        &mut self,
+        zone_id: Uuid,
+        addr: Ipv6Addr,
+        service: ServiceName,
+        port: u16,
+    ) -> anyhow::Result<()> {
+        let zone = self.host_zone(zone_id, addr)?;
+        self.service_backend_zone(service, &zone, port)
+    }
+
+    /// Higher-level shorthand for adding a "switch" zone with its usual set of
+    /// backend services
+    ///
+    /// # Errors
+    ///
+    /// This function fails only if the given zone has already been added to the
+    /// configuration.
+    pub fn host_zone_switch(
+        &mut self,
+        sled_id: Uuid,
+        switch_zone_ip: Ipv6Addr,
+        dendrite_port: u16,
+        mgs_port: u16,
+        mgd_port: u16,
+    ) -> anyhow::Result<()> {
+        let zone = self.host_dendrite(sled_id, switch_zone_ip)?;
+        self.service_backend_zone(ServiceName::Dendrite, &zone, dendrite_port)?;
+        self.service_backend_zone(
+            ServiceName::ManagementGatewayService,
+            &zone,
+            mgs_port,
+        )?;
+        self.service_backend_zone(ServiceName::Mgd, &zone, mgd_port)
+    }
+
+    pub fn generation(&mut self, generation: Generation) {
+        self.generation = generation;
+    }
+
     /// Construct a complete [`DnsConfigParams`] (suitable for propagating to
     /// our DNS servers) for the control plane DNS zone described up to this
     /// point
@@ -378,23 +419,6 @@ impl DnsConfigBuilder {
             (zone.dns_name(), vec![DnsRecord::Aaaa(zone_ip)])
         });
 
-        let scrimlet_srv_records =
-            self.scrimlets.clone().into_iter().map(|(location, addr)| {
-                let srv = DnsRecord::Srv(dns_service_client::types::Srv {
-                    prio: 0,
-                    weight: 0,
-                    port: addr.port(),
-                    target: format!("{location}.scrimlet.{}", DNS_ZONE),
-                });
-                (ServiceName::Scrimlet(location).dns_name(), vec![srv])
-            });
-
-        let scrimlet_aaaa_records =
-            self.scrimlets.into_iter().map(|(location, addr)| {
-                let aaaa = DnsRecord::Aaaa(*addr.ip());
-                (format!("{location}.scrimlet"), vec![aaaa])
-            });
-
         // Assemble the set of SRV records, which implicitly point back at
         // zones' AAAA records.
         let srv_records_zones = self.service_instances_zones.into_iter().map(
@@ -439,12 +463,10 @@ impl DnsConfigBuilder {
             .chain(zone_records)
             .chain(srv_records_sleds)
             .chain(srv_records_zones)
-            .chain(scrimlet_aaaa_records)
-            .chain(scrimlet_srv_records)
             .collect();
 
         DnsConfigParams {
-            generation: 1,
+            generation: u64::from(self.generation),
             time_created: chrono::Utc::now(),
             zones: vec![DnsConfigZone {
                 zone_name: DNS_ZONE.to_owned(),

nexus/blueprint-execution/Cargo.toml

@@ -9,11 +9,15 @@ omicron-rpaths.workspace = true
 [dependencies]
 anyhow.workspace = true
 futures.workspace = true
+internal-dns.workspace = true
+nexus-db-model.workspace = true
 nexus-db-queries.workspace = true
 nexus-types.workspace = true
+omicron-common.workspace = true
 reqwest.workspace = true
 sled-agent-client.workspace = true
 slog.workspace = true
+slog-error-chain.workspace = true
 uuid.workspace = true
 
 # See omicron-rpaths for more about the "pq-sys" dependency.  This is needed
@@ -26,9 +30,7 @@ omicron-workspace-hack.workspace = true
 [dev-dependencies]
 chrono.workspace = true
 httptest.workspace = true
-nexus-db-model.workspace = true
 nexus-test-utils.workspace = true
 nexus-test-utils-macros.workspace = true
-omicron-common.workspace = true
 omicron-nexus.workspace = true
 tokio.workspace = true