Skip to content

[sled-agent-types] reorganize per RFD 619 #9488

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
sunshowers merged 8 commits into from
Dec 12, 2025
Merged

[sled-agent-types] reorganize per RFD 619 #9488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b1910c
[spr] initial version
sunshowers Dec 8, 2025
e218293
rename to sled-agent-types-versions, fix doc breakage
sunshowers Dec 9, 2025
5c044b8
rebase on main, update per RFD
sunshowers Dec 11, 2025
37cf23d
don't depend on propolis_client
sunshowers Dec 11, 2025
36cd28a
remove some pointless comments
sunshowers Dec 11, 2025
60ce253
rebase on main
sunshowers Dec 12, 2025
0b82065
review feedback
sunshowers Dec 12, 2025
091a797
more feedback
sunshowers Dec 12, 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
101 changes: 52 additions & 49 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ members = [
"live-tests/macros",
"nexus",
"nexus-config",
"nexus-sled-agent-shared",
"nexus/authz-macros",
"nexus/auth",
"nexus/background-task-interface",
Expand Down Expand Up @@ -131,6 +130,7 @@ members = [
"sled-agent/config-reconciler",
"sled-agent/repo-depot-api",
"sled-agent/types",
"sled-agent/types/versions",
"sled-agent/zone-images",
"sled-agent/zone-images-examples",
"sled-diagnostics",
Expand Down Expand Up @@ -235,7 +235,6 @@ default-members = [
"live-tests/macros",
"nexus",
"nexus-config",
"nexus-sled-agent-shared",
"nexus/authz-macros",
"nexus/auth",
"nexus/background-task-interface",
Expand Down Expand Up @@ -293,6 +292,7 @@ default-members = [
"sled-agent/config-reconciler",
"sled-agent/repo-depot-api",
"sled-agent/types",
"sled-agent/types/versions",
"sled-agent/zone-images",
"sled-agent/zone-images-examples",
"sled-diagnostics",
Expand Down Expand Up @@ -568,7 +568,6 @@ nexus-reconfigurator-preparation = { path = "nexus/reconfigurator/preparation" }
nexus-reconfigurator-rendezvous = { path = "nexus/reconfigurator/rendezvous" }
nexus-reconfigurator-simulation = { path = "nexus/reconfigurator/simulation" }
nexus-saga-recovery = { path = "nexus/saga-recovery" }
nexus-sled-agent-shared = { path = "nexus-sled-agent-shared" }
nexus-test-interface = { path = "nexus/test-interface" }
nexus-test-utils-macros = { path = "nexus/test-utils-macros" }
nexus-test-utils = { path = "nexus/test-utils" }
Expand Down Expand Up @@ -712,6 +711,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-types = { path = "sled-agent/types" }
sled-agent-types-versions = { path = "sled-agent/types/versions" }
sled-agent-zone-images = { path = "sled-agent/zone-images" }
sled-agent-zone-images-examples = { path = "sled-agent/zone-images-examples" }
sled-diagnostics = { path = "sled-diagnostics" }
Expand Down Expand Up @@ -971,8 +971,9 @@ opt-level = 3
# It's common during development to use a local copy of various complex
# dependencies. If you want to use those, uncomment one of these blocks.
#
# [patch.crates-io]
[patch.crates-io]
# diesel = { path = "../../diesel/diesel" }
# drift = { path = "../drift" }
# dropshot = { path = "../dropshot/dropshot" }
# dropshot_endpoint = { path = "../dropshot/dropshot_endpoint" }
# dropshot-api-manager = { path = "../dropshot-api-manager/crates/dropshot-api-manager" }
Expand Down
2 changes: 1 addition & 1 deletion clients/nexus-lockstep-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ workspace = true
chrono.workspace = true
futures.workspace = true
iddqd.workspace = true
nexus-sled-agent-shared.workspace = true
sled-agent-types-versions.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
omicron-passwords.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion clients/nexus-lockstep-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ progenitor::generate_api!(
ReconfiguratorConfig = nexus_types::deployment::ReconfiguratorConfig,
ReconfiguratorConfigParam = nexus_types::deployment::ReconfiguratorConfigParam,
ReconfiguratorConfigView = nexus_types::deployment::ReconfiguratorConfigView,
RecoverySiloConfig = nexus_sled_agent_shared::recovery_silo::RecoverySiloConfig,
RecoverySiloConfig = sled_agent_types_versions::latest::rack_init::RecoverySiloConfig,
SledAgentUpdateStatus = nexus_types::internal_api::views::SledAgentUpdateStatus,
UpdateStatus = nexus_types::internal_api::views::UpdateStatus,
ZoneStatus = nexus_types::internal_api::views::ZoneStatus,
Expand Down
2 changes: 1 addition & 1 deletion clients/sled-agent-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ workspace = true
anyhow.workspace = true
async-trait.workspace = true
chrono.workspace = true
nexus-sled-agent-shared.workspace = true
sled-agent-types-versions.workspace = true
omicron-common.workspace = true
omicron-uuid-kinds.workspace = true
omicron-workspace-hack.workspace = true
Expand Down
24 changes: 12 additions & 12 deletions clients/sled-agent-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ progenitor::generate_api!(
"oxnet" = "0.1.0",
},
replace = {
Baseboard = nexus_sled_agent_shared::inventory::Baseboard,
Baseboard = sled_agent_types_versions::latest::inventory::Baseboard,
ByteCount = omicron_common::api::external::ByteCount,
DatasetsConfig = omicron_common::disk::DatasetsConfig,
DatasetManagementStatus = omicron_common::disk::DatasetManagementStatus,
Expand All @@ -62,21 +62,21 @@ progenitor::generate_api!(
Generation = omicron_common::api::external::Generation,
Hostname = omicron_common::api::external::Hostname,
ImportExportPolicy = omicron_common::api::external::ImportExportPolicy,
Inventory = nexus_sled_agent_shared::inventory::Inventory,
InventoryDisk = nexus_sled_agent_shared::inventory::InventoryDisk,
InventoryZpool = nexus_sled_agent_shared::inventory::InventoryZpool,
Inventory = sled_agent_types_versions::latest::inventory::Inventory,
InventoryDisk = sled_agent_types_versions::latest::inventory::InventoryDisk,
InventoryZpool = sled_agent_types_versions::latest::inventory::InventoryZpool,
MacAddr = omicron_common::api::external::MacAddr,
MupdateOverrideBootInventory = nexus_sled_agent_shared::inventory::MupdateOverrideBootInventory,
MupdateOverrideBootInventory = sled_agent_types_versions::latest::inventory::MupdateOverrideBootInventory,
Name = omicron_common::api::external::Name,
NetworkInterface = omicron_common::api::internal::shared::NetworkInterface,
OmicronPhysicalDiskConfig = omicron_common::disk::OmicronPhysicalDiskConfig,
OmicronPhysicalDisksConfig = omicron_common::disk::OmicronPhysicalDisksConfig,
OmicronSledConfig = nexus_sled_agent_shared::inventory::OmicronSledConfig,
OmicronZoneConfig = nexus_sled_agent_shared::inventory::OmicronZoneConfig,
OmicronZoneDataset = nexus_sled_agent_shared::inventory::OmicronZoneDataset,
OmicronZoneImageSource = nexus_sled_agent_shared::inventory::OmicronZoneImageSource,
OmicronZoneType = nexus_sled_agent_shared::inventory::OmicronZoneType,
OmicronZonesConfig = nexus_sled_agent_shared::inventory::OmicronZonesConfig,
OmicronSledConfig = sled_agent_types_versions::latest::inventory::OmicronSledConfig,
OmicronZoneConfig = sled_agent_types_versions::latest::inventory::OmicronZoneConfig,
OmicronZoneDataset = sled_agent_types_versions::latest::inventory::OmicronZoneDataset,
OmicronZoneImageSource = sled_agent_types_versions::latest::inventory::OmicronZoneImageSource,
OmicronZoneType = sled_agent_types_versions::latest::inventory::OmicronZoneType,
OmicronZonesConfig = sled_agent_types_versions::latest::inventory::OmicronZonesConfig,
PortFec = omicron_common::api::internal::shared::PortFec,
PortSpeed = omicron_common::api::internal::shared::PortSpeed,
RouterId = omicron_common::api::internal::shared::RouterId,
Expand All @@ -85,7 +85,7 @@ progenitor::generate_api!(
ResolvedVpcRouteSet = omicron_common::api::internal::shared::ResolvedVpcRouteSet,
RouterTarget = omicron_common::api::internal::shared::RouterTarget,
RouterVersion = omicron_common::api::internal::shared::RouterVersion,
SledRole = nexus_sled_agent_shared::inventory::SledRole,
SledRole = sled_agent_types_versions::latest::inventory::SledRole,
SourceNatConfigGeneric = omicron_common::api::internal::shared::SourceNatConfigGeneric,
SwitchLocation = omicron_common::api::external::SwitchLocation,
Vni = omicron_common::api::external::Vni,
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/omdb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ nexus-inventory.workspace = true
nexus-lockstep-client.workspace = true
nexus-reconfigurator-preparation.workspace = true
nexus-saga-recovery.workspace = true
nexus-sled-agent-shared.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
omicron-uuid-kinds.workspace = true
Expand All @@ -73,6 +72,7 @@ serde.workspace = true
sigpipe.workspace = true
serde_json.workspace = true
sled-agent-client.workspace = true
sled-agent-types.workspace = true
slog.workspace = true
slog-error-chain.workspace = true
steno.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/reconfigurator-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ nexus-inventory.workspace = true
nexus-reconfigurator-blippy.workspace = true
nexus-reconfigurator-planning.workspace = true
nexus-reconfigurator-simulation.workspace = true
nexus-sled-agent-shared.workspace = true
nexus-types.workspace = true
sled-agent-types.workspace = true
omicron-common.workspace = true
omicron-repl-utils.workspace = true
omicron-uuid-kinds.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/reconfigurator-cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ use nexus_reconfigurator_simulation::{
};
use nexus_reconfigurator_simulation::{SimStateBuilder, SimTufRepoSource};
use nexus_reconfigurator_simulation::{SimTufRepoDescription, Simulator};
use nexus_sled_agent_shared::inventory::ZoneKind;
use nexus_types::deployment::execution;
use nexus_types::deployment::execution::blueprint_external_dns_config;
use nexus_types::deployment::execution::blueprint_internal_dns_config;
Expand Down Expand Up @@ -68,6 +67,7 @@ use omicron_uuid_kinds::SledUuid;
use omicron_uuid_kinds::VnicUuid;
use omicron_uuid_kinds::{BlueprintUuid, MupdateOverrideUuid};
use omicron_uuid_kinds::{CollectionUuid, MupdateUuid};
use sled_agent_types::inventory::ZoneKind;
use slog_error_chain::InlineErrorChain;
use std::borrow::Cow;
use std::collections::BTreeSet;
Expand Down
2 changes: 1 addition & 1 deletion live-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ nexus-inventory.workspace = true
nexus-lockstep-client.workspace = true
nexus-reconfigurator-planning.workspace = true
nexus-reconfigurator-preparation.workspace = true
nexus-sled-agent-shared.workspace = true
nexus-types.workspace = true
sled-agent-types.workspace = true
omicron-common.workspace = true
omicron-test-utils.workspace = true
omicron-uuid-kinds.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion live-tests/tests/test_nexus_add_remove.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use nexus_reconfigurator_planning::blueprint_editor::ExternalNetworkingAllocator
use nexus_reconfigurator_planning::planner::Planner;
use nexus_reconfigurator_planning::planner::PlannerRng;
use nexus_reconfigurator_preparation::PlanningInputFromDb;
use nexus_sled_agent_shared::inventory::ZoneKind;
use nexus_types::deployment::BlueprintZoneDisposition;
use nexus_types::deployment::BlueprintZoneType;
use nexus_types::deployment::PlannerConfig;
Expand All @@ -28,6 +27,7 @@ use nexus_types::deployment::blueprint_zone_type;
use omicron_common::address::NEXUS_LOCKSTEP_PORT;
use omicron_test_utils::dev::poll::CondCheckError;
use omicron_test_utils::dev::poll::wait_for_condition;
use sled_agent_types::inventory::ZoneKind;
use slog::{debug, info};
use std::net::SocketAddrV6;
use std::sync::Arc;
Expand Down
67 changes: 0 additions & 67 deletions nexus-sled-agent-shared/README.md
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions nexus-sled-agent-shared/src/lib.rs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion nexus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ nexus-reconfigurator-execution.workspace = true
nexus-reconfigurator-planning.workspace = true
nexus-reconfigurator-preparation.workspace = true
nexus-reconfigurator-rendezvous.workspace = true
nexus-sled-agent-shared.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
omicron-passwords.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion nexus/db-model/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ omicron-common.workspace = true
nexus-config.workspace = true
nexus-db-schema.workspace = true
nexus-defaults.workspace = true
nexus-sled-agent-shared.workspace = true
nexus-types.workspace = true
omicron-passwords.workspace = true
sled-agent-client.workspace = true
sled-agent-types.workspace = true
omicron-workspace-hack.workspace = true
tufaceous-artifact.workspace = true

Expand Down
2 changes: 1 addition & 1 deletion nexus/db-model/src/deployment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ use nexus_db_schema::schema::{
bp_pending_mgs_update_sp, bp_sled_metadata, bp_target,
debug_log_blueprint_planning,
};
use nexus_sled_agent_shared::inventory::OmicronZoneDataset;
use nexus_types::deployment::BlueprintPhysicalDiskDisposition;
use nexus_types::deployment::BlueprintTarget;
use nexus_types::deployment::BlueprintZoneConfig;
Expand Down Expand Up @@ -68,6 +67,7 @@ use omicron_uuid_kinds::{
GenericUuid, MupdateOverrideKind, OmicronZoneKind, OmicronZoneUuid,
PhysicalDiskKind, SledKind, SledUuid, ZpoolKind, ZpoolUuid,
};
use sled_agent_types::inventory::OmicronZoneDataset;
use std::net::{IpAddr, SocketAddrV6};
use std::sync::Arc;
use uuid::Uuid;
Expand Down
2 changes: 1 addition & 1 deletion nexus/db-model/src/external_ip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ use diesel::Selectable;
use ipnetwork::IpNetwork;
use nexus_db_schema::schema::external_ip;
use nexus_db_schema::schema::floating_ip;
use nexus_sled_agent_shared::inventory::ZoneKind;
use nexus_types::deployment::OmicronZoneExternalFloatingIp;
use nexus_types::deployment::OmicronZoneExternalIp;
use nexus_types::deployment::OmicronZoneExternalSnatIp;
Expand All @@ -37,6 +36,7 @@ use schemars::JsonSchema;
use serde::Deserialize;
use serde::Serialize;
use sled_agent_client::types::InstanceExternalIpBody;
use sled_agent_types::inventory::ZoneKind;
use slog_error_chain::SlogInlineError;
use std::convert::TryFrom;
use std::net::IpAddr;
Expand Down
Loading
Loading