Chore: Networking stack update

Cargo.toml

@@ -245,15 +245,15 @@ omicron-sled-agent = { path = "sled-agent" }
 omicron-test-utils = { path = "test-utils" }
 omicron-zone-package = "0.8.3"
 oxide-client = { path = "clients/oxide-client" }
-oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "98d33125413f01722947e322f82caf9d22209434", features = [ "api", "std" ] }
+oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "631c2017f19cafb1535f621e9e5aa9198ccad869", features = [ "api", "std" ] }
 once_cell = "1.18.0"
 openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" }
 openapiv3 = "1.0"
 # must match samael's crate!
 openssl = "0.10"
 openssl-sys = "0.9"
 openssl-probe = "0.1.2"
-opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "98d33125413f01722947e322f82caf9d22209434" }
+opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "631c2017f19cafb1535f621e9e5aa9198ccad869" }
 oso = "0.26"
 owo-colors = "3.5.0"
 oximeter = { path = "oximeter/oximeter" }

nexus/src/app/sagas/switch_port_settings_apply.rs

@@ -175,7 +175,7 @@ pub(crate) fn api_to_dpd_port_settings(
                         .to_string(),
                     RouteSettingsV4 {
                         link_id: link_id.0,
-                        nexthop: Some(gw),
+                        nexthop: gw,
                         vid: r.vid.map(Into::into),
                     },
                 );
@@ -194,7 +194,7 @@ pub(crate) fn api_to_dpd_port_settings(
                         .to_string(),
                     RouteSettingsV6 {
                         link_id: link_id.0,
-                        nexthop: Some(gw),
+                        nexthop: gw,
                         vid: r.vid.map(Into::into),
                     },
                 );

package-manifest.toml

@@ -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 = "363e365135cfa46d7f7558d8670f35aa8fe412e9"
-source.sha256 = "2dc34eaac7eb9d320594f3ac125df6a601fe020e0b3c7f16eb0a5ebddc8e18b9"
+source.commit = "7712104585266a2898da38c1345210ad26f9e71d"
+source.sha256 = "486b0b016c0df06947810b90f3a3dd40423f0ee6f255ed079dc8e5618c9a7281"
 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 = "363e365135cfa46d7f7558d8670f35aa8fe412e9"
-source.sha256 = "1616eb25ab3d3a8b678b6cf3675af7ba61d455c3e6c2ba2a2d35a663861bc8e8"
+source.commit = "7712104585266a2898da38c1345210ad26f9e71d"
+source.sha256 = "76ff76d3526323c3fcbe2351cf9fbda4840e0dc11cd0eb6b71a3e0bd36c5e5e8"
 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 = "363e365135cfa46d7f7558d8670f35aa8fe412e9"
-source.sha256 = "a045e6dbb84dbceaf3a8a7dc33d283449fbeaf081442d0ae14ce8d8ffcdda4e9"
+source.commit = "7712104585266a2898da38c1345210ad26f9e71d"
+source.sha256 = "b8e5c176070f9bc9ea0028de1999c77d66ea3438913664163975964effe4481b"
 output.type = "zone"
 output.intermediate_only = true
 

sled-agent/src/bootstrap/early_networking.rs

@@ -495,14 +495,13 @@ impl<'a> EarlyNetworkSetup<'a> {
                     e
                 ))
             })?;
-        let nexthop = Some(uplink_config.gateway_ip);
         dpd_port_settings.v4_routes.insert(
             Ipv4Cidr { prefix: "0.0.0.0".parse().unwrap(), prefix_len: 0 }
                 .to_string(),
             RouteSettingsV4 {
                 link_id: link_id.0,
                 vid: uplink_config.uplink_vid,
-                nexthop,
+                nexthop: uplink_config.gateway_ip,
             },
         );
         Ok((ipv6_entry, dpd_port_settings, port_id))

tools/ci_download_softnpu_machinery

@@ -15,7 +15,7 @@ OUT_DIR="out/npuzone"
 
 # Pinned commit for softnpu ASIC simulator
 SOFTNPU_REPO="softnpu"
-SOFTNPU_COMMIT="64beaff129b7f63a04a53dd5ed0ec09f012f5756"
+SOFTNPU_COMMIT="41b3a67b3d44f51528816ff8e539b4001df48305"
 
 # This is the softnpu ASIC simulator
 echo "fetching npuzone"

tools/dendrite_openapi_version

@@ -1,2 +1,2 @@
-COMMIT="363e365135cfa46d7f7558d8670f35aa8fe412e9"
-SHA2="4da5edf1571a550a90aa8679a25c1535d2b02154dfb6034f170e421c2633bc31"
+COMMIT="7712104585266a2898da38c1345210ad26f9e71d"
+SHA2="cb3f0cfbe6216d2441d34e0470252e0fb142332e47b33b65c24ef7368a694b6d"

tools/dendrite_stub_checksums

@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="2dc34eaac7eb9d320594f3ac125df6a601fe020e0b3c7f16eb0a5ebddc8e18b9"
-CIDL_SHA256_LINUX_DPD="5a976d1e43031f4790d1cd2f42d226b47c1be9c998917666f21cfaa3a7b13939"
-CIDL_SHA256_LINUX_SWADM="38680e69364ffbfc43fea524786580d151ff45ce2f1802bd5179599f7c80e5f8"
+CIDL_SHA256_ILLUMOS="486b0b016c0df06947810b90f3a3dd40423f0ee6f255ed079dc8e5618c9a7281"
+CIDL_SHA256_LINUX_DPD="af97aaf7e1046a5c651d316c384171df6387b4c54c8ae4a3ef498e532eaa5a4c"
+CIDL_SHA256_LINUX_SWADM="909e400dcc9880720222c6dc3919404d83687f773f668160f66f38b51a81c188"

tools/opte_version

@@ -1 +1 @@
-0.23.173
+0.23.181

wicketd/src/preflight_check/uplink.rs

@@ -777,7 +777,7 @@ fn build_port_settings(
         DPD_DEFAULT_IPV4_CIDR.parse().unwrap(),
         RouteSettingsV4 {
             link_id: link_id.0,
-            nexthop: Some(uplink.gateway_ip),
+            nexthop: uplink.gateway_ip,
             vid: uplink.uplink_vid,
         },
     );