ready to land

Created using spr 1.3.6-beta.1

Cargo.toml

@@ -19,7 +19,6 @@ members = [
     "cockroach-admin/api",
     "cockroach-admin/types",
     "common",
-    "common-extended",
     "dev-tools/crdb-seed",
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
@@ -44,6 +43,7 @@ members = [
     "key-manager",
     "nexus",
     "nexus-config",
+    "nexus-sled-agent-shared",
     "nexus/authz-macros",
     "nexus/auth",
     "nexus/db-fixed-data",
@@ -119,7 +119,6 @@ default-members = [
     "cockroach-admin/api",
     "cockroach-admin/types",
     "common",
-    "common-extended",
     "dev-tools/crdb-seed",
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
@@ -147,6 +146,7 @@ default-members = [
     "key-manager",
     "nexus",
     "nexus-config",
+    "nexus-sled-agent-shared",
     "nexus/authz-macros",
     "nexus/auth",
     "nexus/db-fixed-data",
@@ -379,30 +379,30 @@ nexus-reconfigurator-execution = { path = "nexus/reconfigurator/execution" }
 nexus-reconfigurator-planning = { path = "nexus/reconfigurator/planning" }
 nexus-reconfigurator-preparation = { path = "nexus/reconfigurator/preparation" }
 nexus-saga-recovery = { path = "nexus/saga-recovery" }
-omicron-certificates = { path = "certificates" }
-omicron-passwords = { path = "passwords" }
-omicron-workspace-hack = "0.1.0"
-oxlog = { path = "dev-tools/oxlog" }
-oxnet = { git = "https://github.com/oxidecomputer/oxnet" }
+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" }
 nexus-types = { path = "nexus/types" }
 num-integer = "0.1.46"
 num = { version = "0.4.3", default-features = false, features = [ "libm" ] }
+omicron-certificates = { path = "certificates" }
 omicron-cockroach-admin = { path = "cockroach-admin" }
 omicron-common = { path = "common" }
-omicron-common-extended = { path = "common-extended" }
 omicron-gateway = { path = "gateway" }
 omicron-nexus = { path = "nexus" }
 omicron-omdb = { path = "dev-tools/omdb" }
 omicron-package = { path = "package" }
+omicron-passwords = { path = "passwords" }
 omicron-rpaths = { path = "rpaths" }
 omicron-sled-agent = { path = "sled-agent" }
 omicron-test-utils = { path = "test-utils" }
+omicron-workspace-hack = "0.1.0"
 omicron-zone-package = "0.11.0"
 oxide-client = { path = "clients/oxide-client" }
 oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "3dc9a3dd8d3c623f0cf2c659c7119ce0c026a96d", features = [ "api", "std" ] }
+oxlog = { path = "dev-tools/oxlog" }
+oxnet = { git = "https://github.com/oxidecomputer/oxnet" }
 once_cell = "1.19.0"
 openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" }
 openapiv3 = "2.0.0"

clients/nexus-client/Cargo.toml

@@ -11,8 +11,8 @@ workspace = true
 chrono.workspace = true
 futures.workspace = true
 nexus-types.workspace = true
+nexus-sled-agent-shared.workspace = true
 omicron-common.workspace = true
-omicron-common-extended.workspace = true
 omicron-passwords.workspace = true
 oxnet.workspace = true
 progenitor.workspace = true

clients/nexus-client/src/lib.rs

@@ -40,7 +40,7 @@ progenitor::generate_api!(
         NewPasswordHash = omicron_passwords::NewPasswordHash,
         OmicronPhysicalDiskConfig = nexus_types::disk::OmicronPhysicalDiskConfig,
         OmicronPhysicalDisksConfig = nexus_types::disk::OmicronPhysicalDisksConfig,
-        RecoverySiloConfig = omicron_common_extended::recovery_silo::RecoverySiloConfig,
+        RecoverySiloConfig = nexus_sled_agent_shared::recovery_silo::RecoverySiloConfig,
         TypedUuidForCollectionKind = omicron_uuid_kinds::CollectionUuid,
         TypedUuidForDownstairsKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::DownstairsKind>,
         TypedUuidForPropolisKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::PropolisKind>,

clients/sled-agent-client/Cargo.toml

@@ -11,8 +11,8 @@ workspace = true
 anyhow.workspace = true
 async-trait.workspace = true
 chrono.workspace = true
+nexus-sled-agent-shared.workspace = true
 omicron-common.workspace = true
-omicron-common-extended.workspace = true
 omicron-uuid-kinds.workspace = true
 omicron-workspace-hack.workspace = true
 oxnet.workspace = true

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

@@ -36,32 +36,32 @@ progenitor::generate_api!(
         "oxnet" = "0.1.0",
     },
     replace = {
-        Baseboard = omicron_common_extended::inventory::Baseboard,
+        Baseboard = nexus_sled_agent_shared::inventory::Baseboard,
         ByteCount = omicron_common::api::external::ByteCount,
         DiskIdentity = omicron_common::disk::DiskIdentity,
         DiskVariant = omicron_common::disk::DiskVariant,
         Generation = omicron_common::api::external::Generation,
         ImportExportPolicy = omicron_common::api::external::ImportExportPolicy,
-        Inventory = omicron_common_extended::inventory::Inventory,
-        InventoryDisk = omicron_common_extended::inventory::InventoryDisk,
-        InventoryZpool = omicron_common_extended::inventory::InventoryZpool,
+        Inventory = nexus_sled_agent_shared::inventory::Inventory,
+        InventoryDisk = nexus_sled_agent_shared::inventory::InventoryDisk,
+        InventoryZpool = nexus_sled_agent_shared::inventory::InventoryZpool,
         MacAddr = omicron_common::api::external::MacAddr,
         Name = omicron_common::api::external::Name,
         NetworkInterface = omicron_common::api::internal::shared::NetworkInterface,
         OmicronPhysicalDiskConfig = omicron_common::disk::OmicronPhysicalDiskConfig,
         OmicronPhysicalDisksConfig = omicron_common::disk::OmicronPhysicalDisksConfig,
-        OmicronZoneConfig = omicron_common_extended::inventory::OmicronZoneConfig,
-        OmicronZoneDataset = omicron_common_extended::inventory::OmicronZoneDataset,
-        OmicronZoneType = omicron_common_extended::inventory::OmicronZoneType,
-        OmicronZonesConfig = omicron_common_extended::inventory::OmicronZonesConfig,
+        OmicronZoneConfig = nexus_sled_agent_shared::inventory::OmicronZoneConfig,
+        OmicronZoneDataset = nexus_sled_agent_shared::inventory::OmicronZoneDataset,
+        OmicronZoneType = nexus_sled_agent_shared::inventory::OmicronZoneType,
+        OmicronZonesConfig = nexus_sled_agent_shared::inventory::OmicronZonesConfig,
         PortFec = omicron_common::api::internal::shared::PortFec,
         PortSpeed = omicron_common::api::internal::shared::PortSpeed,
         RouterId = omicron_common::api::internal::shared::RouterId,
         ResolvedVpcRoute = omicron_common::api::internal::shared::ResolvedVpcRoute,
         ResolvedVpcRouteSet = omicron_common::api::internal::shared::ResolvedVpcRouteSet,
         RouterTarget = omicron_common::api::internal::shared::RouterTarget,
         RouterVersion = omicron_common::api::internal::shared::RouterVersion,
-        SledRole = omicron_common_extended::inventory::SledRole,
+        SledRole = nexus_sled_agent_shared::inventory::SledRole,
         SourceNatConfig = omicron_common::api::internal::shared::SourceNatConfig,
         SwitchLocation = omicron_common::api::external::SwitchLocation,
         TypedUuidForInstanceKind = omicron_uuid_kinds::InstanceUuid,