Add support for dual-stack external addressing (#9470)

- Adds enum for tracking the external IP addresses for an instance or
service, which includes the three fields that were previously separate:
SNAT, ephemeral, and list of floating addresses.
- Makes the previous source NAT config type IP address specific, with a
"generic" variant for services. This is a bit lazy, but we can lift the
IP version out of the contained IP address and into the source NAT type
itself in the future if we need to.
- Add new version of the sled-agent API with these new types, plus
conversions with the previous version
- Completely handle dual-stack OPTE ports, closes #9247
- Closes #9318

Author: bnaecker

Cargo.lock

@@ -132,11 +132,11 @@ impl From<omicron_common::address::Ipv6Range> for types::Ipv6Range {
     }
 }
 
-impl From<&omicron_common::api::internal::shared::SourceNatConfig>
-    for types::SourceNatConfig
+impl From<&omicron_common::api::internal::shared::SourceNatConfigGeneric>
+    for types::SourceNatConfigGeneric
 {
     fn from(
-        r: &omicron_common::api::internal::shared::SourceNatConfig,
+        r: &omicron_common::api::internal::shared::SourceNatConfigGeneric,
     ) -> Self {
         let (first_port, last_port) = r.port_range_raw();
         Self { ip: r.ip, first_port, last_port }

clients/nexus-lockstep-client/src/lib.rs

@@ -56,6 +56,9 @@ progenitor::generate_api!(
         DiskManagementError = omicron_common::disk::DiskManagementError,
         DiskVariant = omicron_common::disk::DiskVariant,
         ExternalIpGatewayMap = omicron_common::api::internal::shared::ExternalIpGatewayMap,
+        ExternalIpConfig = omicron_common::api::internal::shared::ExternalIpConfig,
+        ExternalIpv4Config = omicron_common::api::internal::shared::ExternalIpv4Config,
+        ExternalIpv6Config = omicron_common::api::internal::shared::ExternalIpv6Config,
         Generation = omicron_common::api::external::Generation,
         Hostname = omicron_common::api::external::Hostname,
         ImportExportPolicy = omicron_common::api::external::ImportExportPolicy,
@@ -83,7 +86,7 @@ progenitor::generate_api!(
         RouterTarget = omicron_common::api::internal::shared::RouterTarget,
         RouterVersion = omicron_common::api::internal::shared::RouterVersion,
         SledRole = nexus_sled_agent_shared::inventory::SledRole,
-        SourceNatConfig = omicron_common::api::internal::shared::SourceNatConfig,
+        SourceNatConfigGeneric = omicron_common::api::internal::shared::SourceNatConfigGeneric,
         SwitchLocation = omicron_common::api::external::SwitchLocation,
         Vni = omicron_common::api::external::Vni,
         VpcFirewallIcmpFilter = omicron_common::api::external::VpcFirewallIcmpFilter,

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

@@ -27,6 +27,7 @@ hex.workspace = true
 http.workspace = true
 iddqd.workspace = true
 ipnetwork.workspace = true
+itertools.workspace = true
 lldp_protocol.workspace = true
 macaddr.workspace = true
 mg-admin-client.workspace = true