Make preflight vlan-aware

Bump dendrite to get nat ingress fix
oxidecomputer · Jun 6, 2024 · f39302d · f39302d
1 parent 9590547
commit f39302d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/package-manifest.toml b/package-manifest.toml
@@ -628,8 +628,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 = "b629123812b5a82f64a3fdd2d7485c94b4404264"
-source.sha256 = "4873e260b7a75de8070efea6b6ab775a409f4328e522cacb80e884d63490da36"
+source.commit = "174f564a39c84d3c187f45d71240dfda1758af18"
+source.sha256 = "bd30253837558b022b55646de0007afd28f04c9043000611b1a3f0f91b66a01c"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -653,8 +653,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 = "b629123812b5a82f64a3fdd2d7485c94b4404264"
-source.sha256 = "ae7a2bb633e9a046d15d4ef93335ec762c31522bf8baef4f75af57e8d04a2dde"
+source.commit = "174f564a39c84d3c187f45d71240dfda1758af18"
+source.sha256 = "310d4f4044834d64a29d690791eef83a4a692ed3e9d152c6404c924a46abdb5b"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -671,8 +671,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 = "b629123812b5a82f64a3fdd2d7485c94b4404264"
-source.sha256 = "6a96a24efa89a89f5c50ddf58c48758857ad35ba119dbd474f228eb9765a8c4f"
+source.commit = "174f564a39c84d3c187f45d71240dfda1758af18"
+source.sha256 = "ec44b882b02aef2ce225d1a332360459f19c799aa6f13014945e4f51ea57ff18"
 output.type = "zone"
 output.intermediate_only = true
 

diff --git a/tools/dendrite_openapi_version b/tools/dendrite_openapi_version
@@ -1,2 +1,2 @@
-COMMIT="b629123812b5a82f64a3fdd2d7485c94b4404264"
+COMMIT="174f564a39c84d3c187f45d71240dfda1758af18"
 SHA2="a9305b44ad70a00d699ef8720ea15431679e8fc5e549220c30e510e1d9e80036"
diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums
@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="4873e260b7a75de8070efea6b6ab775a409f4328e522cacb80e884d63490da36"
-CIDL_SHA256_LINUX_DPD="786e5cdc175a94c1e7e9abd2b6486183ebac28e6223e18ebea73523ff93a1fac"
+CIDL_SHA256_ILLUMOS="bd30253837558b022b55646de0007afd28f04c9043000611b1a3f0f91b66a01c"
+CIDL_SHA256_LINUX_DPD="64f590f1ba8a237cfef33d1ac212bacfc68188c96707dbd0de8f53121f1e19de"
 CIDL_SHA256_LINUX_SWADM="e614de71aa93cfc611cc3228ccb3d48f497413495d10342af38948cea0efbbaa"
diff --git a/wicketd/src/preflight_check/uplink.rs b/wicketd/src/preflight_check/uplink.rs
@@ -301,15 +301,18 @@ fn add_steps_for_single_local_uplink_preflight_check<'a>(
                     UplinkProperty(format!("uplinks/{}_0", port));
 
                 for addr in &uplink.addresses {
-                    let uplink_cidr = addr.to_string();
+                    // This includes the CIDR only
+                    let uplink_cidr = addr.address.to_string();
+                    // This includes the VLAN ID, if any
+                    let uplink_cfg = addr.to_string();
                     if let Err(err) = execute_command(&[
                         SVCCFG,
                         "-s",
                         UPLINK_SMF_NAME,
                         "addpropvalue",
                         &uplink_property.0,
                         "astring:",
-                        &uplink_cidr,
+                        &uplink_cfg,
                     ])
                     .await
                     {