Adapt RouteSettingsV4 to recent dendrite changes

`nexthop` entries are no longer optional, and every place we instantiated a `RouteEntryV4` is guaranteed to have such an entry.
oxidecomputer · Sep 29, 2023 · 670332e · 670332e
1 parent 91590ab
commit 670332e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/nexus/src/app/sagas/switch_port_settings_apply.rs b/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),
                     },
                 );

diff --git a/sled-agent/src/bootstrap/early_networking.rs b/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))

diff --git a/wicketd/src/preflight_check/uplink.rs b/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,
         },
     );