[1/n] [sled-agent] split early networking into its own crate (#10448)

Working on extending the ls-apis analysis to treat RSS separately from
Sled Agent
(#10318 (comment)),
we realized that certain assumptions that hold for RSS (namely that the
rack has a consistent version) are not upheld for early networking.

Split early networking into its own crate, and make the main
omicron-sled-agent crate depend on it. (Due to #10370, RSS no longer
depends on the new early networking crate.) This means that after the
work to treat RSS separately, any clients depended on by the new
sled-agent-early-networking crate are attributed only to Sled Agent.

Author: sunshowers

Cargo.lock

@@ -148,6 +148,7 @@ members = [
     "sled-agent/bootstrap-agent-lockstep-api",
     "sled-agent/bootstrap-agent-lockstep-types",
     "sled-agent/config-reconciler",
+    "sled-agent/early-networking",
     "sled-agent/health-monitor",
     "sled-agent/measurements",
     "sled-agent/rack-setup",
@@ -335,6 +336,7 @@ default-members = [
     "sled-agent/bootstrap-agent-lockstep-api",
     "sled-agent/bootstrap-agent-lockstep-types",
     "sled-agent/config-reconciler",
+    "sled-agent/early-networking",
     "sled-agent/health-monitor",
     "sled-agent/measurements",
     "sled-agent/rack-setup",
@@ -792,6 +794,7 @@ sled = "=0.34.7"
 sled-agent-api = { path = "sled-agent/api" }
 sled-agent-client = { path = "clients/sled-agent-client" }
 sled-agent-config-reconciler = { path = "sled-agent/config-reconciler" }
+sled-agent-early-networking = { path = "sled-agent/early-networking" }
 sled-agent-health-monitor = { path = "sled-agent/health-monitor" }
 sled-agent-measurements = { path = "sled-agent/measurements" }
 sled-agent-rack-setup = { path = "sled-agent/rack-setup" }

Cargo.toml

@@ -80,7 +80,7 @@ NTP Admin (client: ntp-admin-client)
     consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path
 
 NTP Admin version 1 (client: ntp-admin-v1-client)
-    consumed by: omicron-sled-agent (omicron/sled-agent) via 2 paths
+    consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path
 
 External API (client: oxide-client)
 

dev-tools/ls-apis/tests/api_dependencies.out

@@ -61,7 +61,6 @@ nexus-config.workspace = true
 nexus-lockstep-client.workspace = true
 nexus-types.workspace = true
 nix = { workspace = true, features = ["signal"] }
-ntp-admin-v1-client.workspace = true
 omicron-common.workspace = true
 omicron-ledger.workspace = true
 omicron-ddm-admin-client.workspace = true
@@ -90,6 +89,7 @@ signal-hook.workspace = true
 sled-agent-api.workspace = true
 sled-agent-client.workspace = true
 sled-agent-config-reconciler.workspace = true
+sled-agent-early-networking.workspace = true
 sled-agent-health-monitor.workspace = true
 sled-agent-measurements.workspace = true
 sled-agent-rack-setup.workspace = true
@@ -109,7 +109,6 @@ slog-error-chain.workspace = true
 slog-term.workspace = true
 smf.workspace = true
 sprockets-tls.workspace = true
-static_assertions.workspace = true
 strum.workspace = true
 tar.workspace = true
 thiserror.workspace = true

sled-agent/Cargo.toml

@@ -0,0 +1,31 @@
+[package]
+name = "sled-agent-early-networking"
+version = "0.1.0"
+edition.workspace = true
+license = "MPL-2.0"
+
+[lints]
+workspace = true
+
+[dependencies]
+anyhow.workspace = true
+# XXX NOTE this is due to https://github.com/oxidecomputer/omicron/issues/9704
+# This is the R17 dpd client
+# dpd-client.workspace = true
+dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "cc8e02a0800034c431c8cf96b889ea638da3d194" }
+futures.workspace = true
+gateway-client.workspace = true
+http.workspace = true
+internal-dns-resolver.workspace = true
+internal-dns-types.workspace = true
+mg-admin-client.workspace = true
+omicron-common.workspace = true
+omicron-ddm-admin-client.workspace = true
+omicron-workspace-hack.workspace = true
+oxnet.workspace = true
+rdb-types.workspace = true
+sled-agent-types.workspace = true
+slog.workspace = true
+slog-error-chain.workspace = true
+thiserror.workspace = true
+tokio = { workspace = true, features = ["full"] }

sled-agent/early-networking/Cargo.toml

@@ -45,6 +45,10 @@ use sled_agent_types::early_networking::{
 use sled_agent_types::sled::ThisSledSwitchZoneUnderlayIpAddr;
 use sled_agent_types::system_networking::SystemNetworkingConfig;
 use slog::Logger;
+use slog::error;
+use slog::info;
+use slog::o;
+use slog::warn;
 use slog_error_chain::InlineErrorChain;
 use std::collections::{HashMap, HashSet};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};

…agent/rack-setup/src/early_networking.rs sled-agent/early-networking/src/lib.rssled-agent/rack-setup/src/early_networking.rs renamed to sled-agent/early-networking/src/lib.rs sled-agent/rack-setup/src/early_networking.rs renamed to sled-agent/early-networking/src/lib.rs

@@ -16,19 +16,13 @@ cancel-safe-futures.workspace = true
 chrono.workspace = true
 cockroach-admin-client.workspace = true
 dns-service-client.workspace = true
-# XXX NOTE this is due to https://github.com/oxidecomputer/omicron/issues/9704
-# This is the R17 dpd client
-# dpd-client.workspace = true
-dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "cc8e02a0800034c431c8cf96b889ea638da3d194" }
 futures.workspace = true
-gateway-client.workspace = true
 http.workspace = true
 iddqd.workspace = true
 illumos-utils.workspace = true
 internal-dns-resolver.workspace = true
 internal-dns-types.workspace = true
 itertools.workspace = true
-mg-admin-client.workspace = true
 nexus-lockstep-client.workspace = true
 nexus-types.workspace = true
 ntp-admin-client.workspace = true
@@ -38,8 +32,7 @@ omicron-ledger.workspace = true
 omicron-uuid-kinds.workspace = true
 omicron-workspace-hack.workspace = true
 oxnet.workspace = true
-rand = { workspace = true, features = ["os_rng"] }
-rdb-types.workspace = true
+rand.workspace = true
 reqwest = { workspace = true, features = ["rustls", "stream"] }
 schemars = { workspace = true, features = ["chrono", "uuid1"] }
 serde.workspace = true

sled-agent/rack-setup/Cargo.toml

@@ -7,12 +7,9 @@
 #[macro_use]
 extern crate slog;
 
-mod early_networking;
 mod plan;
 mod service;
 
-pub use early_networking::EarlyNetworkSetup;
-pub use early_networking::EarlyNetworkSetupError;
 pub use plan::service::PlannedSledDescription;
 pub use plan::service::ServicePlan;
 pub use plan::service::SledConfig;

sled-agent/rack-setup/src/lib.rs

@@ -67,7 +67,6 @@
 //! after a clean slate upon failure.
 //! See <https://github.com/oxidecomputer/omicron/issues/7174> for details.
 
-use crate::early_networking::EarlyNetworkSetupError;
 use crate::plan::service::PlanError as ServicePlanError;
 use crate::plan::service::ServicePlan;
 use crate::plan::sled::SledPlan;
@@ -265,11 +264,6 @@ pub enum SetupServiceError {
     #[error("Failed to construct valid set of service zone NAT entries")]
     InvalidServiceZoneNatEntries(#[from] ServiceZoneNatEntriesError),
 
-    // We used transparent, because `EarlyNetworkSetupError` contains a subset
-    // of error variants already in this type
-    #[error(transparent)]
-    EarlyNetworkSetup(#[from] EarlyNetworkSetupError),
-
     #[error("Rack already initialized")]
     RackAlreadyInitialized,
 

sled-agent/rack-setup/src/service.rs

@@ -84,7 +84,7 @@ use omicron_common::backoff::{
 use omicron_common::disk::{DatasetKind, DatasetName};
 use omicron_ddm_admin_client::DdmError;
 use omicron_uuid_kinds::OmicronZoneUuid;
-use sled_agent_rack_setup::{EarlyNetworkSetup, EarlyNetworkSetupError};
+use sled_agent_early_networking::{EarlyNetworkSetup, EarlyNetworkSetupError};
 use sled_agent_resolvable_files::{
     ZoneImageSourceResolver, ramdisk_file_source,
 };