From cecce68bf55df446d36d073ed326ea0e0b0a75e0 Mon Sep 17 00:00:00 2001 From: Nils Nieuwejaar Date: Thu, 19 Oct 2023 20:13:20 +0000 Subject: [PATCH] update with latest upstream bits --- nexus/src/app/rack.rs | 3 ++- .../app/sagas/switch_port_settings_apply.rs | 12 ++--------- package-manifest.toml | 20 +++++++++---------- sled-agent/src/bootstrap/early_networking.rs | 1 - tools/dendrite_openapi_version | 4 ++-- tools/dendrite_stub_checksums | 6 +++--- tools/maghemite_openapi_version | 2 +- wicketd/src/preflight_check/uplink.rs | 3 +-- 8 files changed, 21 insertions(+), 30 deletions(-) diff --git a/nexus/src/app/rack.rs b/nexus/src/app/rack.rs index 3ac4b9063d9..6863f808627 100644 --- a/nexus/src/app/rack.rs +++ b/nexus/src/app/rack.rs @@ -263,8 +263,9 @@ impl super::Nexus { let qsfp_ports: Vec = all_ports .iter() + .map(|port| port.to_string()) .filter(|port| port.starts_with("qsfp")) - .map(|port| port.to_string().parse().unwrap()) + .map(|port| port.parse().unwrap()) .collect(); info!( diff --git a/nexus/src/app/sagas/switch_port_settings_apply.rs b/nexus/src/app/sagas/switch_port_settings_apply.rs index 9a8a5790516..ec85320a091 100644 --- a/nexus/src/app/sagas/switch_port_settings_apply.rs +++ b/nexus/src/app/sagas/switch_port_settings_apply.rs @@ -173,11 +173,7 @@ pub(crate) fn api_to_dpd_port_settings( dpd_port_settings.v4_routes.insert( Ipv4Cidr { prefix: n.ip(), prefix_len: n.prefix() } .to_string(), - vec![RouteSettingsV4 { - link_id: link_id.0, - nexthop: gw, - vid: r.vid.map(Into::into), - }], + vec![RouteSettingsV4 { link_id: link_id.0, nexthop: gw }], ); } IpNetwork::V6(n) => { @@ -192,11 +188,7 @@ pub(crate) fn api_to_dpd_port_settings( dpd_port_settings.v6_routes.insert( Ipv6Cidr { prefix: n.ip(), prefix_len: n.prefix() } .to_string(), - vec![RouteSettingsV6 { - link_id: link_id.0, - nexthop: gw, - vid: r.vid.map(Into::into), - }], + vec![RouteSettingsV6 { link_id: link_id.0, nexthop: gw }], ); } } diff --git a/package-manifest.toml b/package-manifest.toml index f351f877c75..31b67ccb2cc 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -422,10 +422,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "112dbbedb9c8d9d98003469db4cf8ac42c07f2c2" +source.commit = "085d6932ff1dea06e500092e4ff9cacbe7cd5351" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//maghemite.sha256.txt -source.sha256 = "e100fdb3b12ad0b8a9c749e5daa53ed226a6a00fed845ae35a2951da37844e0b" +source.sha256 = "6044414fd80f6859b13350e4f136c22df3be00ebbf654dd73e278dc2c8320f3a" output.type = "tarball" [package.mg-ddm] @@ -438,10 +438,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "112dbbedb9c8d9d98003469db4cf8ac42c07f2c2" +source.commit = "085d6932ff1dea06e500092e4ff9cacbe7cd5351" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm.sha256.txt -source.sha256 = "8ee061cf9a9e439207c26b426e372ee2f5cd9cc8343c168824d486eaf6e348dc" +source.sha256 = "ea1195986e9d65d7256e48e2ef367b1b0ac716d70f161a7fc1acdde9ad01aa91" output.type = "zone" output.intermediate_only = true @@ -458,8 +458,8 @@ only_for_targets.image = "standard" # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out source.type = "prebuilt" source.repo = "dendrite" -source.commit = "69e3fde2c2c72a6b1984a6932ac19ca910b07ed1" -source.sha256 = "f79dd942852f2ae8187eec695f3768987b1ad9b3200037787cb97bd58138d4f5" +source.commit = "5e3d9586d51082d24bd8e7eb18a1ba2fa04f9402" +source.sha256 = "ecc58aa4429b89b686063ef97a9241ab1bf5a4efb48ab1158c1d8b2961577ca7" output.type = "zone" output.intermediate_only = true @@ -483,8 +483,8 @@ only_for_targets.image = "standard" # 2. Copy the output zone image from dendrite/out to omicron/out source.type = "prebuilt" source.repo = "dendrite" -source.commit = "69e3fde2c2c72a6b1984a6932ac19ca910b07ed1" -source.sha256 = "8d5def7746f5a7dd88b5eb72dfba2b8416eabfccd1a9a2f88810d068e8e301be" +source.commit = "5e3d9586d51082d24bd8e7eb18a1ba2fa04f9402" +source.sha256 = "fa39b8ac190dce27840ec75e88a6f876644763d12c46c11d689e9049d1775451" output.type = "zone" output.intermediate_only = true @@ -501,8 +501,8 @@ only_for_targets.image = "standard" # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz source.type = "prebuilt" source.repo = "dendrite" -source.commit = "69e3fde2c2c72a6b1984a6932ac19ca910b07ed1" -source.sha256 = "ebdbb277c77e98116cb2cdc6722e85d36a5379a5d84e8194db231f9f16884aca" +source.commit = "5e3d9586d51082d24bd8e7eb18a1ba2fa04f9402" +source.sha256 = "e1ddb0dd7b8338ff4b73f0ecfe7a17fbed813b490bee55f9b373f4038199b42a" output.type = "zone" output.intermediate_only = true diff --git a/sled-agent/src/bootstrap/early_networking.rs b/sled-agent/src/bootstrap/early_networking.rs index 5da49219050..592fb883626 100644 --- a/sled-agent/src/bootstrap/early_networking.rs +++ b/sled-agent/src/bootstrap/early_networking.rs @@ -500,7 +500,6 @@ impl<'a> EarlyNetworkSetup<'a> { .to_string(), vec![RouteSettingsV4 { link_id: link_id.0, - vid: uplink_config.uplink_vid, nexthop: uplink_config.gateway_ip, }], ); diff --git a/tools/dendrite_openapi_version b/tools/dendrite_openapi_version index da748204b73..8cb9f394736 100644 --- a/tools/dendrite_openapi_version +++ b/tools/dendrite_openapi_version @@ -1,2 +1,2 @@ -COMMIT="69e3fde2c2c72a6b1984a6932ac19ca910b07ed1" -SHA2="87bacbc488affb4559614f09652f4ec531f2262bcc31f2125dd60c0de91bcb7f" +COMMIT="5e3d9586d51082d24bd8e7eb18a1ba2fa04f9402" +SHA2="544ab42ccc7942d8ece9cdc80cd85d002bcf9d5646a291322bf2f79087ab6df0" diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums index 2c070427d7e..48bed07dc9b 100644 --- a/tools/dendrite_stub_checksums +++ b/tools/dendrite_stub_checksums @@ -1,3 +1,3 @@ -CIDL_SHA256_ILLUMOS="f79dd942852f2ae8187eec695f3768987b1ad9b3200037787cb97bd58138d4f5" -CIDL_SHA256_LINUX_DPD="536a92a65bab2c6a8d84d3d6969bcecbc183a589ffabc4b0f830a8e655753ddf" -CIDL_SHA256_LINUX_SWADM="a6d5d62c3267beb96e7a6616dac0a382649a4a7cd039a5b9b06b1ec14ea7b358" +CIDL_SHA256_ILLUMOS="ecc58aa4429b89b686063ef97a9241ab1bf5a4efb48ab1158c1d8b2961577ca7" +CIDL_SHA256_LINUX_DPD="25a3c1aaf5b587ff152f301ae486cfb9af9da9d854e473be81a73397295c9c07" +CIDL_SHA256_LINUX_SWADM="e7af5fcbe3046da4e9005ef330a5d91f1c5fb94d2ccadd08d580cb6d831c5cc5" diff --git a/tools/maghemite_openapi_version b/tools/maghemite_openapi_version index 6c75c7a4742..c7d1233759e 100644 --- a/tools/maghemite_openapi_version +++ b/tools/maghemite_openapi_version @@ -1,2 +1,2 @@ -COMMIT="112dbbedb9c8d9d98003469db4cf8ac42c07f2c2" +COMMIT="085d6932ff1dea06e500092e4ff9cacbe7cd5351" SHA2="9737906555a60911636532f00f1dc2866dc7cd6553beb106e9e57beabad41cdf" diff --git a/wicketd/src/preflight_check/uplink.rs b/wicketd/src/preflight_check/uplink.rs index c7f9234610a..2df32444d4a 100644 --- a/wicketd/src/preflight_check/uplink.rs +++ b/wicketd/src/preflight_check/uplink.rs @@ -193,7 +193,7 @@ fn add_steps_for_single_local_uplink_preflight_check<'a>( Ok(_response) => { let metadata = vec![format!( "configured {}/{}: ip {}, gateway {}", - *port_id, + port_id.to_string(), link_id.0, uplink.uplink_cidr, uplink.gateway_ip @@ -778,7 +778,6 @@ fn build_port_settings( vec![RouteSettingsV4 { link_id: link_id.0, nexthop: uplink.gateway_ip, - vid: uplink.uplink_vid, }], );