sled-agent: Remove direct dpd NAT entry creation in service zone startup path

Cargo.toml

@@ -151,7 +151,6 @@ 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",
@@ -345,7 +344,6 @@ 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",
@@ -813,7 +811,6 @@ 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" }

dev-tools/ls-apis/api-manifest.toml

@@ -790,47 +790,30 @@ permalinks = [
     "https://github.com/oxidecomputer/dice-util/blob/d7472bfa91aee859c3fe0bdc1dbb1e320285228e/verifier/src/sled_agent.rs#L19-L25",
 ]
 
-# NOTE: The following sled-agent edges are bugs: they cross deployment units.
-# They are kept here to avoid breaking the build, but need to be fixed, either
-# through client-side versioning or by some other means.
-
 [[intra_deployment_unit_only_edges]]
 server = "omicron-sled-agent"
 client = "gateway-client"
 note = """
-BUG: Sled Agent creates two MGS clients. One of them (in the
-sled-agent-scrimlet-reconcilers crate) queries the switch zone on the same sled,
-which is within the same deployment unit as the global zone, so this is okay.
-
-The other one (early-networking/lib.rs:259, called from services.rs:1095)
-queries both switch zones, so it crosses deployment units. This needs to be
-fixed.
-
-Reference: https://github.com/oxidecomputer/omicron/issues/9708
+Sled Agent on scrimlets talks to MGS within its own sled's switch zone. The
+`sled-agent-scrimlet-reconcilers` crate attempts to go out of its way to ensure
+it's only ever used in this way. The switch zone is within the same deployment
+unit as the global zone on its own sled, so this is okay.
 """
 permalinks = [
     "https://github.com/oxidecomputer/omicron/blob/fbc091a3/sled-agent/scrimlet-reconcilers/src/switch_zone_slot.rs#L46-L59",
-    "https://github.com/oxidecomputer/omicron/blob/32de20c/sled-agent/src/services.rs#L1095-L1102",
-    "https://github.com/oxidecomputer/omicron/blob/32de20c/sled-agent/early-networking/src/lib.rs#L259-L262",
 ]
 
 [[intra_deployment_unit_only_edges]]
 server = "omicron-sled-agent"
 client = "dpd-client"
 note = """
-BUG: Sled Agent creates two DPD clients.  One of them (in the
-sled-agent-scrimlet-reconcilers crate) is always to the switch zone on the same
-sled, which is in the same deployment unit.
-
-The other one (services.rs:1104, iterating addresses returned by
-EarlyNetworkSetup::lookup_uplinked_switch_zone_underlay_addrs) queries both
-switch zones, so it crosses deployment units.  This needs to be fixed.
-
-Reference: https://github.com/oxidecomputer/omicron/issues/9708
+Sled Agent on scrimlets talks to dendrite within its own sled's switch zone. The
+`sled-agent-scrimlet-reconcilers` crate attempts to go out of its way to ensure
+it's only ever used in this way. The switch zone is within the same deployment
+unit as the global zone on its own sled, so this is okay.
 """
 permalinks = [
     "https://github.com/oxidecomputer/omicron/blob/fbc091a3/sled-agent/scrimlet-reconcilers/src/switch_zone_slot.rs#L46-L59",
-    "https://github.com/oxidecomputer/omicron/blob/32de20c/sled-agent/src/services.rs#L1104-L1115",
 ]
 
 # Note: sled-agent-rack-setup (RSS) is marked with `lifecycle = "rack-init"`

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

@@ -38,7 +38,7 @@ Dendrite DPD (client: dpd-client)
     consumed by: lldpd (lldp/lldpd) via 2 paths
     consumed by: mgd (maghemite/mgd) via 1 path
     consumed by: omicron-nexus (omicron/nexus) via 2 paths
-    consumed by: omicron-sled-agent (omicron/sled-agent) via 2 paths
+    consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path
     consumed by: tfportd (dendrite/tfportd) via 2 paths
     consumed by: wicketd (omicron/wicketd) via 2 paths
 
@@ -49,7 +49,7 @@ Management Gateway Service (client: gateway-client)
     consumed by: lldpd (lldp/lldpd) via 1 path
     consumed by: mgd (maghemite/mgd) via 1 path
     consumed by: omicron-nexus (omicron/nexus) via 6 paths
-    consumed by: omicron-sled-agent (omicron/sled-agent) via 2 paths
+    consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path
     consumed by: wicketd (omicron/wicketd) via 3 paths
 
 Wicketd Installinator (client: installinator-client)

sled-agent/Cargo.toml

@@ -31,10 +31,6 @@ clickhouse-admin-types.workspace = true
 derive_more.workspace = true
 dice-verifier = { workspace = true, features = ["ipcc", "mock"] }
 display-error-chain.workspace = true
-# XXX NOTE this is due to https://github.com/oxidecomputer/omicron/issues/9704
-# This is the R20 dpd client
-# dpd-client.workspace = true
-dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "cc0c307c617f2988aafdca4e3bd35ea178b64801" }
 dropshot.workspace = true
 flate2.workspace = true
 flume.workspace = true
@@ -88,7 +84,6 @@ 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