initial draft of blueprints

Cargo.toml

@@ -41,6 +41,7 @@ members = [
     "nexus/db-model",
     "nexus/db-queries",
     "nexus/defaults",
+    "nexus/deployment",
     "nexus/inventory",
     "nexus/test-interface",
     "nexus/test-utils-macros",
@@ -114,6 +115,7 @@ default-members = [
     "nexus/db-model",
     "nexus/db-queries",
     "nexus/defaults",
+    "nexus/deployment",
     "nexus/inventory",
     "nexus/types",
     "oximeter/collector",
@@ -228,6 +230,7 @@ installinator-artifact-client = { path = "clients/installinator-artifact-client"
 installinator-common = { path = "installinator-common" }
 internal-dns = { path = "internal-dns" }
 ipcc = { path = "ipcc" }
+ipnet = "2.9"
 ipnetwork = { version = "0.20", features = ["schemars"] }
 itertools = "0.12.0"
 key-manager = { path = "key-manager" }
@@ -244,6 +247,7 @@ nexus-client = { path = "clients/nexus-client" }
 nexus-db-model = { path = "nexus/db-model" }
 nexus-db-queries = { path = "nexus/db-queries" }
 nexus-defaults = { path = "nexus/defaults" }
+nexus-deployment = { path = "nexus/deployment" }
 nexus-inventory = { path = "nexus/inventory" }
 omicron-certificates = { path = "certificates" }
 omicron-passwords = { path = "passwords" }

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,11 @@ 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,
         IpNetwork = ipnetwork::IpNetwork,
@@ -91,7 +96,7 @@ impl From<omicron_common::api::internal::nexus::InstanceRuntimeState>
     ) -> Self {
         Self {
             dst_propolis_id: s.dst_propolis_id,
-            gen: s.gen.into(),
+            gen: s.gen,
             migration_id: s.migration_id,
             propolis_id: s.propolis_id,
             time_updated: s.time_updated,
@@ -103,11 +108,7 @@ impl From<omicron_common::api::internal::nexus::VmmRuntimeState>
     for types::VmmRuntimeState
 {
     fn from(s: omicron_common::api::internal::nexus::VmmRuntimeState) -> Self {
-        Self {
-            gen: s.gen.into(),
-            state: s.state.into(),
-            time_updated: s.time_updated,
-        }
+        Self { gen: s.gen, state: s.state.into(), time_updated: s.time_updated }
     }
 }
 
@@ -145,19 +146,13 @@ impl From<omicron_common::api::external::InstanceState>
     }
 }
 
-impl From<omicron_common::api::external::Generation> for types::Generation {
-    fn from(s: omicron_common::api::external::Generation) -> Self {
-        Self(i64::from(&s) as u64)
-    }
-}
-
 impl From<omicron_common::api::internal::nexus::DiskRuntimeState>
     for types::DiskRuntimeState
 {
     fn from(s: omicron_common::api::internal::nexus::DiskRuntimeState) -> Self {
         Self {
             disk_state: s.disk_state.into(),
-            gen: s.gen.into(),
+            gen: s.gen,
             time_updated: s.time_updated,
         }
     }

clients/sled-agent-client/src/lib.rs

@@ -27,12 +27,15 @@ progenitor::generate_api!(
     replace = {
         ByteCount = omicron_common::api::external::ByteCount,
         Generation = omicron_common::api::external::Generation,
+        MacAddr = omicron_common::api::external::MacAddr,
         Name = omicron_common::api::external::Name,
         SwitchLocation = omicron_common::api::external::SwitchLocation,
         Ipv6Network = ipnetwork::Ipv6Network,
         IpNetwork = ipnetwork::IpNetwork,
         PortFec = omicron_common::api::internal::shared::PortFec,
         PortSpeed = omicron_common::api::internal::shared::PortSpeed,
+        SourceNatConfig = omicron_common::api::internal::shared::SourceNatConfig,
+        Vni = omicron_common::api::external::Vni,
     }
 );
 
@@ -65,6 +68,24 @@ impl types::OmicronZoneType {
             types::OmicronZoneType::Oximeter { .. } => "oximeter",
         }
     }
+
+    /// Identifies whether this is an NTP zone
+    pub fn is_ntp(&self) -> bool {
+        match self {
+            types::OmicronZoneType::BoundaryNtp { .. }
+            | types::OmicronZoneType::InternalNtp { .. } => true,
+
+            types::OmicronZoneType::Clickhouse { .. }
+            | types::OmicronZoneType::ClickhouseKeeper { .. }
+            | types::OmicronZoneType::CockroachDb { .. }
+            | types::OmicronZoneType::Crucible { .. }
+            | types::OmicronZoneType::CruciblePantry { .. }
+            | types::OmicronZoneType::ExternalDns { .. }
+            | types::OmicronZoneType::InternalDns { .. }
+            | types::OmicronZoneType::Nexus { .. }
+            | types::OmicronZoneType::Oximeter { .. } => false,
+        }
+    }
 }
 
 impl omicron_common::api::external::ClientError for types::Error {
@@ -243,31 +264,6 @@ impl From<types::DiskState> for omicron_common::api::external::DiskState {
     }
 }
 
-impl From<omicron_common::api::external::Vni> for types::Vni {
-    fn from(v: omicron_common::api::external::Vni) -> Self {
-        Self(u32::from(v))
-    }
-}
-
-impl From<types::Vni> for omicron_common::api::external::Vni {
-    fn from(s: types::Vni) -> Self {
-        Self::try_from(s.0).unwrap()
-    }
-}
-
-impl From<omicron_common::api::external::MacAddr> for types::MacAddr {
-    fn from(s: omicron_common::api::external::MacAddr) -> Self {
-        Self::try_from(s.0.to_string())
-            .unwrap_or_else(|e| panic!("{}: {}", s.0, e))
-    }
-}
-
-impl From<types::MacAddr> for omicron_common::api::external::MacAddr {
-    fn from(s: types::MacAddr) -> Self {
-        s.parse().unwrap()
-    }
-}
-
 impl From<omicron_common::api::external::Ipv4Net> for types::Ipv4Net {
     fn from(n: omicron_common::api::external::Ipv4Net) -> Self {
         Self::try_from(n.to_string()).unwrap_or_else(|e| panic!("{}: {}", n, e))
@@ -424,7 +420,7 @@ impl From<omicron_common::api::internal::nexus::HostIdentifier>
         use omicron_common::api::internal::nexus::HostIdentifier::*;
         match s {
             Ip(net) => Self::Ip(net.into()),
-            Vpc(vni) => Self::Vpc(vni.into()),
+            Vpc(vni) => Self::Vpc(vni),
         }
     }
 }
@@ -505,23 +501,15 @@ impl From<omicron_common::api::internal::shared::NetworkInterface>
             kind: s.kind.into(),
             name: s.name,
             ip: s.ip,
-            mac: s.mac.into(),
+            mac: s.mac,
             subnet: s.subnet.into(),
-            vni: s.vni.into(),
+            vni: s.vni,
             primary: s.primary,
             slot: s.slot,
         }
     }
 }
 
-impl From<omicron_common::api::internal::shared::SourceNatConfig>
-    for types::SourceNatConfig
-{
-    fn from(s: omicron_common::api::internal::shared::SourceNatConfig) -> Self {
-        Self { ip: s.ip, first_port: s.first_port, last_port: s.last_port }
-    }
-}
-
 /// Exposes additional [`Client`] interfaces for use by the test suite. These
 /// are bonus endpoints, not generated in the real client.
 #[async_trait]

common/src/address.rs

@@ -168,6 +168,15 @@ pub const RSS_RESERVED_ADDRESSES: u16 = 32;
 // The maximum number of addresses per sled reserved for control plane services.
 pub const CP_SERVICES_RESERVED_ADDRESSES: u16 = 0xFFFF;
 
+// Number of addresses reserved (by the Nexus deployment planner) for allocation
+// by the sled itself.  This is currently used for the first two addresses of
+// the sled subnet, which are used for the sled global zone and the switch zone,
+// if any.  Note that RSS does not honor this yet (in fact, per the above
+// RSS_RESERVED_ADDRESSES, it will _only_ choose from this range).  And
+// historically, systems did not have this reservation at all.  So it's not safe
+// to assume that addresses in this subnet are available.
+pub const SLED_RESERVED_ADDRESSES: u16 = 32;
+
 /// Wraps an [`Ipv6Network`] with a compile-time prefix length.
 #[derive(Debug, Clone, Copy, JsonSchema, Serialize, Hash, PartialEq, Eq)]
 #[schemars(rename = "Ipv6Subnet")]
@@ -279,6 +288,19 @@ impl ReservedRackSubnet {
     }
 }
 
+/// Return the list of DNS servers for the rack, given any address in the AZ
+/// subnet
+pub fn get_internal_dns_server_addresses(addr: Ipv6Addr) -> Vec<IpAddr> {
+    let az_subnet = Ipv6Subnet::<AZ_PREFIX>::new(addr);
+    let reserved_rack_subnet = ReservedRackSubnet::new(az_subnet);
+    let dns_subnets =
+        &reserved_rack_subnet.get_dns_subnets()[0..DNS_REDUNDANCY];
+    dns_subnets
+        .iter()
+        .map(|dns_subnet| IpAddr::from(dns_subnet.dns_address().ip()))
+        .collect()
+}
+
 const SLED_AGENT_ADDRESS_INDEX: usize = 1;
 const SWITCH_ZONE_ADDRESS_INDEX: usize = 2;
 

common/src/api/external/mod.rs

@@ -717,6 +717,7 @@ pub enum ResourceType {
     BackgroundTask,
     BgpConfig,
     BgpAnnounceSet,
+    Blueprint,
     Fleet,
     Silo,
     SiloUser,

dev-tools/omdb/Cargo.toml

@@ -33,6 +33,7 @@ serde.workspace = true
 serde_json.workspace = true
 sled-agent-client.workspace = true
 slog.workspace = true
+slog-error-chain.workspace = true
 strum.workspace = true
 tabled.workspace = true
 textwrap.workspace = true