Skip to content

Add support for dual-stack external addressing #9470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bnaecker merged 4 commits into from
Dec 11, 2025
Merged

Add support for dual-stack external addressing #9470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4774e7f
Add support for dual-stack external addressing
bnaecker Nov 21, 2025
2f3178f
Review feedback
bnaecker Dec 9, 2025
3c2e3a3
Review feedback
bnaecker Dec 9, 2025
bca8f0a
Merge remote-tracking branch 'origin/main' into dual-stack-external-a…
bnaecker Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions clients/nexus-lockstep-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
5 changes: 4 additions & 1 deletion clients/sled-agent-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading