merge main into multicast-e2e, update dednrite hashes

Author: zeeshanlakhani

.github/buildomat/jobs/build-and-test-helios.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "build-and-test (helios)"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-2.0-32c256gb"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"%/work/*",

.github/buildomat/jobs/build-and-test-linux.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "build-and-test (ubuntu-22.04)"
 #: variety = "basic"
-#: target = "ubuntu-22.04"
+#: target = "ubuntu-22.04-large"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"%/work/*",

.github/buildomat/jobs/package.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "helios / package"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-2.0-16c64gb"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"=/work/package.tar.gz",

.github/buildomat/jobs/tuf-repo.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "helios / build TUF repo"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-2.0-16c128gb"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"=/work/manifest.toml",

Cargo.lock

@@ -477,10 +477,10 @@ digest = "0.10.7"
 dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
-dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "258d2be18a97a77049637f010251c233365b1727", features = ["multicast"] }
+dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "e8a68118b5c2333f586d9bdcc4a1f63f2db98631", features = ["multicast"] }
 dropshot = { version = "0.16.6", features = [ "usdt-probes" ] }
-dropshot-api-manager = "0.5.2"
-dropshot-api-manager-types = "0.5.2"
+dropshot-api-manager = "0.6.0"
+dropshot-api-manager-types = "0.6.0"
 dyn-clone = "1.0.20"
 either = "1.15.0"
 ereport-types = { path = "ereport/types" }
@@ -693,7 +693,7 @@ prettyplease = { version = "0.2.36", features = ["verbatim"] }
 proc-macro2 = "1.0"
 progenitor = "0.13.0"
 progenitor-client = "0.13.0"
-progenitor-extras = "0.1.0"
+progenitor-extras = "0.1.1"
 progenitor-client010 = { package = "progenitor-client", version = "0.10.0" }
 # NOTE: if you change the pinned revision of the `bhyve_api` and propolis
 # dependencies, you must also update the references in package-manifest.toml to

Cargo.toml

@@ -27,6 +27,7 @@ progenitor::generate_api!(
         AllowedSourceIps = omicron_common::api::external::AllowedSourceIps,
         Baseboard = sled_hardware_types::Baseboard,
         ImportExportPolicy = sled_agent_types::early_networking::ImportExportPolicy,
+        SwitchSlot = sled_agent_types::early_networking::SwitchSlot,
     },
 );
 

clients/bootstrap-agent-lockstep-client/src/lib.rs

@@ -70,7 +70,7 @@ progenitor::generate_api!(
         ReconfiguratorConfigView = nexus_types::deployment::ReconfiguratorConfigView,
         RecoverySiloConfig = sled_agent_types_versions::latest::rack_init::RecoverySiloConfig,
         SledAgentUpdateStatus = nexus_types::internal_api::views::SledAgentUpdateStatus,
-        SwitchLocation = sled_agent_types::early_networking::SwitchLocation,
+        SwitchSlot = sled_agent_types::early_networking::SwitchSlot,
         TrustQuorumConfig = nexus_types::trust_quorum::TrustQuorumConfig,
         UpdateStatus = nexus_types::internal_api::views::UpdateStatus,
         ZoneStatus = nexus_types::internal_api::views::ZoneStatus,

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

@@ -29,17 +29,7 @@ progenitor::generate_api!(
     }),
     derives = [schemars::JsonSchema, PartialEq],
     patch = {
-        BfdPeerConfig = { derives = [Eq, Hash] },
-        BgpConfig = { derives = [Eq, Hash] },
-        BgpPeerConfig = { derives = [Eq, Hash] },
-        MaxPathConfig = { derives = [Eq, Hash] },
-        LldpPortConfig = { derives = [Eq, Hash, PartialOrd, Ord] },
-        TxEqConfig = { derives = [Eq, Hash] },
         OmicronPhysicalDiskConfig = { derives = [Eq, Hash, PartialOrd, Ord] },
-        PortConfig = { derives = [Eq, Hash] },
-        RouteConfig = { derives = [Eq, Hash] },
-        RouterLifetimeConfig = { derives = [Eq, Hash] },
-        UplinkAddressConfig = { derives = [Eq, Hash] },
         VirtualNetworkInterfaceHost = { derives = [Eq, Hash] },
     },
     crates = {
@@ -50,6 +40,9 @@ progenitor::generate_api!(
         Attestation = sled_agent_types_versions::latest::rot::Attestation,
         Baseboard = sled_agent_types_versions::latest::inventory::Baseboard,
         BaseboardId = sled_hardware_types::BaseboardId,
+        BfdPeerConfig = sled_agent_types_versions::latest::early_networking::BfdPeerConfig,
+        BgpConfig = sled_agent_types_versions::latest::early_networking::BgpConfig,
+        BgpPeerConfig = sled_agent_types_versions::latest::early_networking::BgpPeerConfig,
         ByteCount = omicron_common::api::external::ByteCount,
         CertificateChain = sled_agent_types_versions::latest::rot::CertificateChain,
         CommitRequest = trust_quorum_types::messages::CommitRequest,
@@ -62,6 +55,7 @@ progenitor::generate_api!(
         DiskManagementStatus = omicron_common::disk::DiskManagementStatus,
         DiskManagementError = omicron_common::disk::DiskManagementError,
         DiskVariant = omicron_common::disk::DiskVariant,
+        EarlyNetworkConfigBody = sled_agent_types_versions::latest::early_networking::EarlyNetworkConfigBody,
         Epoch = trust_quorum_types::types::Epoch,
         ExternalIpGatewayMap = omicron_common::api::internal::shared::ExternalIpGatewayMap,
         ExternalIpConfig = omicron_common::api::internal::shared::ExternalIpConfig,
@@ -73,8 +67,11 @@ progenitor::generate_api!(
         Inventory = sled_agent_types_versions::latest::inventory::Inventory,
         InventoryDisk = sled_agent_types_versions::latest::inventory::InventoryDisk,
         InventoryZpool = sled_agent_types_versions::latest::inventory::InventoryZpool,
+        LldpAdminStatus = sled_agent_types_versions::latest::early_networking::LldpAdminStatus,
+        LldpPortConfig = sled_agent_types_versions::latest::early_networking::LldpPortConfig,
         LrtqUpgradeMsg = trust_quorum_types::messages::LrtqUpgradeMsg,
         MacAddr = omicron_common::api::external::MacAddr,
+        MaxPathConfig = sled_agent_types_versions::latest::early_networking::MaxPathConfig,
         Measurement = sled_agent_types_versions::latest::rot::Measurement,
         MeasurementLog = sled_agent_types_versions::latest::rot::MeasurementLog,
         MupdateOverrideBootInventory = sled_agent_types_versions::latest::inventory::MupdateOverrideBootInventory,
@@ -89,24 +86,31 @@ progenitor::generate_api!(
         OmicronZoneImageSource = sled_agent_types_versions::latest::inventory::OmicronZoneImageSource,
         OmicronZoneType = sled_agent_types_versions::latest::inventory::OmicronZoneType,
         OmicronZonesConfig = sled_agent_types_versions::latest::inventory::OmicronZonesConfig,
+        PortConfig = sled_agent_types_versions::latest::early_networking::PortConfig,
         PortFec = sled_agent_types_versions::latest::early_networking::PortFec,
         PortSpeed = sled_agent_types_versions::latest::early_networking::PortSpeed,
         PrepareAndCommitRequest = trust_quorum_types::messages::PrepareAndCommitRequest,
+        RackNetworkConfig = sled_agent_types_versions::latest::early_networking::RackNetworkConfig,
         ReconfigureMsg = trust_quorum_types::messages::ReconfigureMsg,
         ResolvedVpcFirewallRule = omicron_common::api::internal::shared::ResolvedVpcFirewallRule,
         ResolvedVpcRoute = omicron_common::api::internal::shared::ResolvedVpcRoute,
         ResolvedVpcRouteSet = omicron_common::api::internal::shared::ResolvedVpcRouteSet,
         Rot = sled_agent_types_versions::latest::rot::Rot,
+        RouteConfig = sled_agent_types_versions::latest::early_networking::RouteConfig,
         RouterId = omicron_common::api::internal::shared::RouterId,
+        RouterLifetimeConfig = sled_agent_types_versions::latest::early_networking::RouterLifetimeConfig,
         RouterTarget = omicron_common::api::internal::shared::RouterTarget,
         RouterVersion = omicron_common::api::internal::shared::RouterVersion,
         Sha3_256Digest = sled_agent_types_versions::latest::rot::Sha3_256Digest,
         SledRole = sled_agent_types_versions::latest::inventory::SledRole,
         SourceNatConfigGeneric = omicron_common::api::internal::shared::SourceNatConfigGeneric,
-        SwitchLocation = sled_agent_types_versions::latest::early_networking::SwitchLocation,
+        SwitchSlot = sled_agent_types_versions::latest::early_networking::SwitchSlot,
         Threshold = trust_quorum_types::types::Threshold,
+        TxEqConfig = sled_agent_types_versions::latest::early_networking::TxEqConfig,
+        UplinkAddressConfig = sled_agent_types_versions::latest::early_networking::UplinkAddressConfig,
         Vni = omicron_common::api::external::Vni,
         VpcFirewallIcmpFilter = omicron_common::api::external::VpcFirewallIcmpFilter,
+        WriteNetworkConfigRequest = sled_agent_types_versions::latest::early_networking::WriteNetworkConfigRequest,
         ZpoolKind = omicron_common::zpool_name::ZpoolKind,
         ZpoolName = omicron_common::zpool_name::ZpoolName,
     }

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

@@ -86,7 +86,7 @@ progenitor::generate_api!(
         StepEventForUplinkPreflightSpec = wicket_common::preflight_check::StepEvent,
         StepEventForInstallinatorSpec = installinator_common::StepEvent,
         StepEventForWicketdEngineSpec = wicket_common::update_events::StepEvent,
-        SwitchLocation = omicron_common::api::internal::shared::SwitchLocation,
+        SwitchSlot = sled_agent_types::early_networking::SwitchSlot,
         UpdateSimulatedResult = wicket_common::rack_update::UpdateSimulatedResult,
         UpdateTestError = wicket_common::rack_update::UpdateTestError,
         UplinkPreflightStepId = wicket_common::preflight_check::UplinkPreflightStepId,