bfd modes

Author: rcgoodfellow

nexus/src/app/bfd.rs

@@ -8,7 +8,7 @@ use std::{
 };
 
 use crate::external_api::params;
-use mg_admin_client::types::{AddBfdPeerRequest, PeerState};
+use mg_admin_client::types::{AddBfdPeerRequest, PeerState, SessionMode};
 use nexus_db_queries::context::OpContext;
 use nexus_types::external_api::shared::{BfdState, BfdStatus};
 use omicron_common::api::{
@@ -62,6 +62,10 @@ impl super::Nexus {
                 listen: session.local.unwrap_or(Ipv4Addr::UNSPECIFIED.into()),
                 peer: session.remote,
                 required_rx: session.required_rx,
+                mode: match session.mode {
+                    params::BfdMode::SingleHop => SessionMode::SingleHop,
+                    params::BfdMode::MultiHop => SessionMode::MultiHop,
+                },
             })
             .await
             .map_err(|e| {

nexus/tests/integration_tests/endpoints.rs

@@ -587,6 +587,7 @@ pub static DEMO_BFD_ENABLE: Lazy<params::BfdSessionEnable> =
         detection_threshold: 3,
         required_rx: 1000000,
         switch: "switch0".parse().unwrap(),
+        mode: params::BfdMode::MultiHop,
     });
 
 pub static DEMO_BFD_DISABLE: Lazy<params::BfdSessionDisable> =

nexus/types/src/external_api/params.rs

@@ -1788,6 +1788,13 @@ pub struct BgpStatusSelector {
     pub name_or_id: NameOrId,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
+#[serde(rename_all = "snake_case")]
+pub enum BfdMode {
+    SingleHop,
+    MultiHop,
+}
+
 /// Information about a bidirectional forwarding detection (BFD) session.
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub struct BfdSessionEnable {
@@ -1809,6 +1816,9 @@ pub struct BfdSessionEnable {
 
     /// The switch to enable this session on. Must be `switch0` or `switch1`.
     pub switch: Name,
+
+    /// Select either single-hop (RFC 5881) or multi-hop (RFC 5883)
+    pub mode: BfdMode,
 }
 
 /// Information needed to disable a BFD session

openapi/nexus.json

@@ -8579,6 +8579,13 @@
           "serial"
         ]
       },
+      "BfdMode": {
+        "type": "string",
+        "enum": [
+          "single_hop",
+          "multi_hop"
+        ]
+      },
       "BfdSessionDisable": {
         "description": "Information needed to disable a BFD session",
         "type": "object",
@@ -8618,6 +8625,14 @@
             "type": "string",
             "format": "ip"
           },
+          "mode": {
+            "description": "Select either single-hop (RFC 5881) or multi-hop (RFC 5883)",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/BfdMode"
+              }
+            ]
+          },
           "remote": {
             "description": "Address of the remote peer to establish a BFD session with.",
             "type": "string",
@@ -8640,6 +8655,7 @@
         },
         "required": [
           "detection_threshold",
+          "mode",
           "remote",
           "required_rx",
           "switch"

package-manifest.toml

@@ -446,7 +446,7 @@ 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 = "b451569a2a82cdd3cf354a348929010a2265b8e5"
+source.commit = "11ab054e44a5169b7f6d9014f1e2d8d8ccd04c01"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/maghemite.sha256.txt
 source.sha256 = "8f8838e87ec10e1b2b7e0df0a6c4594d263d5c2192734ab30bacc725fc88a794"
@@ -462,7 +462,7 @@ 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 = "b451569a2a82cdd3cf354a348929010a2265b8e5"
+source.commit = "11ab054e44a5169b7f6d9014f1e2d8d8ccd04c01"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
 source.sha256 = "325891a260dda5730947b0d7bbd27e6f6ac22b725a1d0eff31db528dae9c02ee"
@@ -477,10 +477,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 = "b451569a2a82cdd3cf354a348929010a2265b8e5"
+source.commit = "11ab054e44a5169b7f6d9014f1e2d8d8ccd04c01"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
-source.sha256 = "da7fa95903e728d03d0075533c746d8b65bf185228fc45ae55faa13852541cda"
+source.sha256 = "249d3abcb7c2ee3ebc0817eae3d43f290362c566ca20b83134235f914068b758"
 output.type = "zone"
 output.intermediate_only = true
 

tools/maghemite_ddm_openapi_version

@@ -1,2 +1,2 @@
-COMMIT="b451569a2a82cdd3cf354a348929010a2265b8e5"
+COMMIT="11ab054e44a5169b7f6d9014f1e2d8d8ccd04c01"
 SHA2="0b0dbc2f8bbc5d2d9be92d64c4865f8f9335355aae62f7de9f67f81dfb3f1803"

tools/maghemite_mg_openapi_version

@@ -1,2 +1,2 @@
-COMMIT="b451569a2a82cdd3cf354a348929010a2265b8e5"
-SHA2="515b4c65c3785a558b37857e8bea128d0521b9d85290d2f2c272adbe561b0929"
+COMMIT="11ab054e44a5169b7f6d9014f1e2d8d8ccd04c01"
+SHA2="11a659afb82c65caa3e773f73713c33c3066ab107f84b82f81721ef31eaede0b"

tools/maghemite_mgd_checksums

@@ -1,2 +1,2 @@
-CIDL_SHA256="da7fa95903e728d03d0075533c746d8b65bf185228fc45ae55faa13852541cda"
-MGD_LINUX_SHA256="45696f58fa6e6142479c9ba19145a3d1134302a414354422f0560788f9558743"
+CIDL_SHA256="249d3abcb7c2ee3ebc0817eae3d43f290362c566ca20b83134235f914068b758"
+MGD_LINUX_SHA256="1204388cb93e4fe733189ef0ba37039b3c0058c07c77e06303162734cd1b41c4"