Skip to content

[3/n] move rack_initialization_complete to nexus-lockstep #9155

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[3/n] move rack_initialization_complete to nexus-lockstep #9155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd2782f
move `rack_initialization_complete` to nexus-lockstep
iliana Oct 6, 2025
aebdb3e
Merge remote-tracking branch 'origin/main' into iliana/nexus-lockstep…
iliana Oct 7, 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
5 changes: 3 additions & 2 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: 2 additions & 4 deletions clients/nexus-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ chrono.workspace = true
futures.workspace = true
iddqd.workspace = true
nexus-types.workspace = true
nexus-sled-agent-shared.workspace = true
omicron-common.workspace = true
omicron-passwords.workspace = true
omicron-uuid-kinds.workspace = true
omicron-workspace-hack.workspace = true
oxnet.workspace = true
progenitor.workspace = true
regress.workspace = true
Expand All @@ -24,5 +24,3 @@ serde.workspace = true
serde_json.workspace = true
slog.workspace = true
uuid.workspace = true
omicron-workspace-hack.workspace = true
omicron-uuid-kinds.workspace = true
161 changes: 0 additions & 161 deletions clients/nexus-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
//! Interface for making API requests to the Oxide control plane at large
//! from within the control plane

use std::collections::HashMap;

progenitor::generate_api!(
spec = "../../openapi/nexus-internal.json",
interface = Positional,
Expand All @@ -28,31 +26,11 @@ progenitor::generate_api!(
"oxnet" = "0.1.0",
},
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,
BlueprintPhysicalDiskConfig = nexus_types::deployment::BlueprintPhysicalDiskConfig,
BlueprintPhysicalDiskDisposition = nexus_types::deployment::BlueprintPhysicalDiskDisposition,
BlueprintZoneImageSource = nexus_types::deployment::BlueprintZoneImageSource,
Certificate = omicron_common::api::internal::nexus::Certificate,
DatasetKind = omicron_common::api::internal::shared::DatasetKind,
DnsConfigParams = nexus_types::internal_api::params::DnsConfigParams,
DnsConfigZone = nexus_types::internal_api::params::DnsConfigZone,
DnsRecord = nexus_types::internal_api::params::DnsRecord,
Generation = omicron_common::api::external::Generation,
ImportExportPolicy = omicron_common::api::external::ImportExportPolicy,
MacAddr = omicron_common::api::external::MacAddr,
Name = omicron_common::api::external::Name,
NetworkInterface = omicron_common::api::internal::shared::NetworkInterface,
NetworkInterfaceKind = omicron_common::api::internal::shared::NetworkInterfaceKind,
NewPasswordHash = omicron_passwords::NewPasswordHash,
OximeterReadMode = nexus_types::deployment::OximeterReadMode,
PendingMgsUpdate = nexus_types::deployment::PendingMgsUpdate,
PlannerConfig = nexus_types::deployment::PlannerConfig,
RecoverySiloConfig = nexus_sled_agent_shared::recovery_silo::RecoverySiloConfig,
Srv = nexus_types::internal_api::params::Srv,
ZpoolName = omicron_common::zpool_name::ZpoolName,
},
patch = {
SledAgentInfo = { derives = [PartialEq, Eq] },
Expand Down Expand Up @@ -250,131 +228,6 @@ impl From<types::Duration> for std::time::Duration {
}
}

impl From<omicron_common::address::IpRange> for types::IpRange {
fn from(r: omicron_common::address::IpRange) -> Self {
use omicron_common::address::IpRange;
match r {
IpRange::V4(r) => types::IpRange::V4(r.into()),
IpRange::V6(r) => types::IpRange::V6(r.into()),
}
}
}

impl From<omicron_common::address::Ipv4Range> for types::Ipv4Range {
fn from(r: omicron_common::address::Ipv4Range) -> Self {
Self { first: r.first, last: r.last }
}
}

impl From<omicron_common::address::Ipv6Range> for types::Ipv6Range {
fn from(r: omicron_common::address::Ipv6Range) -> Self {
Self { first: r.first, last: r.last }
}
}

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

impl From<omicron_common::api::internal::shared::PortSpeed>
for types::PortSpeed
{
fn from(value: omicron_common::api::internal::shared::PortSpeed) -> Self {
match value {
omicron_common::api::internal::shared::PortSpeed::Speed0G => {
types::PortSpeed::Speed0G
}
omicron_common::api::internal::shared::PortSpeed::Speed1G => {
types::PortSpeed::Speed1G
}
omicron_common::api::internal::shared::PortSpeed::Speed10G => {
types::PortSpeed::Speed10G
}
omicron_common::api::internal::shared::PortSpeed::Speed25G => {
types::PortSpeed::Speed25G
}
omicron_common::api::internal::shared::PortSpeed::Speed40G => {
types::PortSpeed::Speed40G
}
omicron_common::api::internal::shared::PortSpeed::Speed50G => {
types::PortSpeed::Speed50G
}
omicron_common::api::internal::shared::PortSpeed::Speed100G => {
types::PortSpeed::Speed100G
}
omicron_common::api::internal::shared::PortSpeed::Speed200G => {
types::PortSpeed::Speed200G
}
omicron_common::api::internal::shared::PortSpeed::Speed400G => {
types::PortSpeed::Speed400G
}
}
}
}

impl From<omicron_common::api::internal::shared::PortFec> for types::PortFec {
fn from(value: omicron_common::api::internal::shared::PortFec) -> Self {
match value {
omicron_common::api::internal::shared::PortFec::Firecode => {
types::PortFec::Firecode
}
omicron_common::api::internal::shared::PortFec::None => {
types::PortFec::None
}
omicron_common::api::internal::shared::PortFec::Rs => {
types::PortFec::Rs
}
}
}
}

impl From<omicron_common::api::internal::shared::SwitchLocation>
for types::SwitchLocation
{
fn from(
value: omicron_common::api::internal::shared::SwitchLocation,
) -> Self {
match value {
omicron_common::api::internal::shared::SwitchLocation::Switch0 => {
types::SwitchLocation::Switch0
}
omicron_common::api::internal::shared::SwitchLocation::Switch1 => {
types::SwitchLocation::Switch1
}
}
}
}

impl From<omicron_common::api::internal::shared::ExternalPortDiscovery>
for types::ExternalPortDiscovery
{
fn from(
value: omicron_common::api::internal::shared::ExternalPortDiscovery,
) -> Self {
match value {
omicron_common::api::internal::shared::ExternalPortDiscovery::Auto(val) => {
let new: HashMap<_, _> = val.iter().map(|(slot, addr)| {
(slot.to_string(), *addr)
}).collect();
types::ExternalPortDiscovery::Auto(new)
},
omicron_common::api::internal::shared::ExternalPortDiscovery::Static(val) => {
let new: HashMap<_, _> = val.iter().map(|(slot, ports)| {
(slot.to_string(), ports.clone())
}).collect();
types::ExternalPortDiscovery::Static(new)
},
}
}
}

impl From<types::ProducerKind>
for omicron_common::api::internal::nexus::ProducerKind
{
Expand Down Expand Up @@ -408,17 +261,3 @@ impl TryFrom<types::ProducerEndpoint>
})
}
}

impl From<&omicron_common::api::external::AllowedSourceIps>
for types::AllowedSourceIps
{
fn from(ips: &omicron_common::api::external::AllowedSourceIps) -> Self {
use omicron_common::api::external::AllowedSourceIps;
match ips {
AllowedSourceIps::Any => types::AllowedSourceIps::Any,
AllowedSourceIps::List(list) => {
types::AllowedSourceIps::List(list.iter().cloned().collect())
}
}
}
}
2 changes: 2 additions & 0 deletions clients/nexus-lockstep-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ workspace = true
chrono.workspace = true
futures.workspace = true
iddqd.workspace = true
nexus-sled-agent-shared.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
omicron-passwords.workspace = true
omicron-uuid-kinds.workspace = true
omicron-workspace-hack.workspace = true
oxnet.workspace = true
Expand Down
Loading
Loading