add pending neighbor status command

Author: rcgoodfellow

bgp/src/params.rs

@@ -8,7 +8,7 @@ use rdb::{ImportExportPolicy, PolicyAction, Prefix4, Prefix6};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::net::SocketAddrV6;
+use std::net::{Ipv6Addr, SocketAddrV6};
 use std::time::Duration;
 use std::{
     collections::BTreeMap,
@@ -57,6 +57,12 @@ pub struct UnnumberedNeighbor {
     pub parameters: BgpPeerParameters,
 }
 
+#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq)]
+pub struct PendingUnnumberedNeighbor {
+    pub interface: String,
+    pub local_addr: Ipv6Addr,
+}
+
 impl From<Neighbor> for PeerConfig {
     fn from(rq: Neighbor) -> Self {
         Self {

mg-api/src/lib.rs

@@ -12,8 +12,8 @@ use bfd::BfdPeerState;
 use bgp::{
     params::{
         ApplyRequest, CheckerSource, Neighbor, NeighborResetOp, Origin4,
-        Origin6, PeerInfo, PeerInfoV1, Router, ShaperSource,
-        UnnumberedNeighbor,
+        Origin6, PeerInfo, PeerInfoV1, PendingUnnumberedNeighbor, Router,
+        ShaperSource, UnnumberedNeighbor,
     },
     session::{FsmEventRecord, MessageHistory, MessageHistoryV1},
 };
@@ -154,6 +154,16 @@ pub trait MgAdminApi {
 
     // Unnumbered neighbors ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+    #[endpoint {
+        method = GET,
+        path = "/bgp/config/unnumbered-pending",
+        versions = VERSION_UNNUMBERED..,
+    }]
+    async fn read_pending_unnumbered_neighbors(
+        rqctx: RequestContext<Self::Context>,
+        request: Query<AsnSelector>,
+    ) -> Result<HttpResponseOk<Vec<PendingUnnumberedNeighbor>>, HttpError>;
+
     #[endpoint {
         method = GET,
         path = "/bgp/config/unnumbered-neighbors",

mgadm/src/bgp.rs

@@ -75,6 +75,11 @@ pub enum StatusCmd {
         asn: u32,
     },
 
+    PendingNeighbors {
+        #[clap(env)]
+        asn: u32,
+    },
+
     /// Get the prefixes exported by a BGP router.
     Exported {
         #[clap(env)]
@@ -806,6 +811,9 @@ pub async fn commands(command: Commands, c: Client) -> Result<()> {
 
         Commands::Status(cmd) => match cmd.command {
             StatusCmd::Neighbors { asn } => get_neighbors(c, asn).await?,
+            StatusCmd::PendingNeighbors { asn } => {
+                list_unnumbered_pending(asn, c).await?
+            }
             StatusCmd::Exported { asn } => get_exported(c, asn).await?,
         },
 
@@ -975,6 +983,12 @@ async fn delete_nbr(asn: u32, addr: IpAddr, c: Client) -> Result<()> {
     Ok(())
 }
 
+async fn list_unnumbered_pending(asn: u32, c: Client) -> Result<()> {
+    let pending = c.read_pending_unnumbered_neighbors(asn).await?;
+    println!("{pending:#?}");
+    Ok(())
+}
+
 async fn list_unnumbered_nbr(asn: u32, c: Client) -> Result<()> {
     let nbrs = c.read_unnumbered_neighbors(asn).await?;
     println!("{nbrs:#?}");

mgd/src/admin.rs

@@ -188,6 +188,13 @@ impl MgAdminApi for MgAdminApiImpl {
 
     // Unnumbered neighbors ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+    async fn read_pending_unnumbered_neighbors(
+        rqctx: RequestContext<Self::Context>,
+        request: Query<AsnSelector>,
+    ) -> Result<HttpResponseOk<Vec<PendingUnnumberedNeighbor>>, HttpError> {
+        bgp_admin::read_pending_unnumbered_neighbors(rqctx, request).await
+    }
+
     async fn read_unnumbered_neighbors(
         rqctx: RequestContext<Self::Context>,
         request: Query<AsnSelector>,

mgd/src/bgp_admin.rs

@@ -257,6 +257,29 @@ pub async fn clear_neighbor(
 
 // Unnumbered neighbors ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+pub async fn read_pending_unnumbered_neighbors(
+    rqctx: RequestContext<Arc<HandlerContext>>,
+    request: Query<AsnSelector>,
+) -> Result<HttpResponseOk<Vec<PendingUnnumberedNeighbor>>, HttpError> {
+    let rq = request.into_inner();
+    let ctx = rqctx.context();
+
+    let pending = ctx.bgp.unnumbered_manager.get_pending();
+    let mut result = Vec::default();
+
+    for k in pending.keys() {
+        if k.asn != rq.asn {
+            continue;
+        }
+        result.push(PendingUnnumberedNeighbor {
+            interface: k.interface.name.clone(),
+            local_addr: k.interface.ip,
+        });
+    }
+
+    Ok(HttpResponseOk(result))
+}
+
 pub async fn read_unnumbered_neighbors(
     rqctx: RequestContext<Arc<HandlerContext>>,
     request: Query<AsnSelector>,

mgd/src/unnumbered_manager.rs

@@ -28,15 +28,15 @@ pub struct UnnumberedNeighborManager {
 }
 
 #[derive(Debug, PartialEq, Eq, Hash, Clone)]
-struct NbrKey {
-    asn: u32,
-    interface: Ipv6NetworkInterface,
+pub struct NbrKey {
+    pub asn: u32,
+    pub interface: Ipv6NetworkInterface,
 }
 
 #[derive(Clone)]
-struct NbrInfo {
-    nbr: UnnumberedNeighbor,
-    session: SessionInfo,
+pub struct NbrInfo {
+    pub nbr: UnnumberedNeighbor,
+    pub session: SessionInfo,
 }
 
 #[derive(Debug, thiserror::Error)]
@@ -195,6 +195,10 @@ impl UnnumberedNeighborManager {
         })
     }
 
+    pub fn get_pending(self: &Arc<Self>) -> HashMap<NbrKey, NbrInfo> {
+        self.pending_sessions.lock().unwrap().clone()
+    }
+
     fn run(self: Arc<Self>, log: Logger) {
         const RUN_LOOP_INTERVAL: Duration = Duration::from_secs(1);
         loop {

…napi/mg-admin/mg-admin-3.0.0-8b08af.json …napi/mg-admin/mg-admin-3.0.0-c7526d.jsonopenapi/mg-admin/mg-admin-3.0.0-8b08af.json renamed to openapi/mg-admin/mg-admin-3.0.0-c7526d.json openapi/mg-admin/mg-admin-3.0.0-8b08af.json renamed to openapi/mg-admin/mg-admin-3.0.0-c7526d.json

@@ -1060,6 +1060,46 @@
         }
       }
     },
+    "/bgp/config/unnumbered-pending": {
+      "get": {
+        "operationId": "read_pending_unnumbered_neighbors",
+        "parameters": [
+          {
+            "in": "query",
+            "name": "asn",
+            "description": "ASN of the router to get imported prefixes from.",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "title": "Array_of_PendingUnnumberedNeighbor",
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PendingUnnumberedNeighbor"
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "$ref": "#/components/responses/Error"
+          },
+          "5XX": {
+            "$ref": "#/components/responses/Error"
+          }
+        }
+      }
+    },
     "/bgp/history/fsm": {
       "get": {
         "operationId": "fsm_history",
@@ -3777,6 +3817,22 @@
           "keepalive"
         ]
       },
+      "PendingUnnumberedNeighbor": {
+        "type": "object",
+        "properties": {
+          "interface": {
+            "type": "string"
+          },
+          "local_addr": {
+            "type": "string",
+            "format": "ipv6"
+          }
+        },
+        "required": [
+          "interface",
+          "local_addr"
+        ]
+      },
       "Prefix": {
         "oneOf": [
           {

openapi/mg-admin/mg-admin-latest.json

@@ -1 +1 @@
-mg-admin-3.0.0-8b08af.json
+mg-admin-3.0.0-c7526d.json