[mg-admin] migrate to API trait (#546)

Part of oxidecomputer/omicron#8922.

Author: sunshowers

Cargo.lock

@@ -14,6 +14,7 @@ default-members = [
     "tests",
     "rdb",
     "bgp",
+    "mg-api",
     "mg-admin-client",
     "mgadm",
     "mgd",
@@ -35,6 +36,7 @@ members = [
     "mg-ddm-verify",
     "tests",
     "bgp",
+    "mg-api",
     "mg-admin-client",
     "mgadm",
     "rdb",
@@ -85,6 +87,7 @@ http-body-util = "0.1"
 humantime = "2.1"
 rand = "0.8.5"
 backoff = "0.4"
+mg-api = { path = "mg-api" }
 mg-common = { path = "mg-common" }
 chrono = { version = "0.4.41", features = ["serde"] }
 oxide-tokio-rt = "0.1.2"

Cargo.toml

@@ -12,6 +12,7 @@ pub mod dispatcher;
 pub mod error;
 pub mod fanout;
 pub mod messages;
+pub mod params;
 pub mod policy;
 pub mod router;
 pub mod session;

bgp/src/lib.rs

@@ -2,13 +2,12 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use bgp::config::PeerConfig;
-use bgp::session::{FsmStateKind, MessageHistory};
+use crate::config::PeerConfig;
+use crate::session::FsmStateKind;
 use rdb::{ImportExportPolicy, Path, PolicyAction, Prefix4};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeSet, HashMap};
-use std::num::NonZeroU8;
 use std::time::Duration;
 use std::{
     collections::BTreeMap,
@@ -30,32 +29,13 @@ pub struct Router {
     pub graceful_shutdown: bool,
 }
 
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-pub struct DeleteRouterRequest {
-    /// Autonomous system number for the router to remove
-    pub asn: u32,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-pub struct NeighborSelector {
-    pub asn: u32,
-    pub addr: IpAddr,
-}
-
 #[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
 pub enum NeighborResetOp {
     Hard,
     SoftInbound,
     SoftOutbound,
 }
 
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-pub struct NeighborResetRequest {
-    pub asn: u32,
-    pub addr: IpAddr,
-    pub op: NeighborResetOp,
-}
-
 #[derive(Debug, Deserialize, Serialize, JsonSchema, Clone, PartialEq)]
 pub struct Neighbor {
     pub asn: u32,
@@ -154,12 +134,6 @@ impl Neighbor {
     }
 }
 
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-pub struct DeleteNeighborRequest {
-    pub asn: u32,
-    pub addr: IpAddr,
-}
-
 #[derive(Debug, Deserialize, Serialize, JsonSchema)]
 pub struct AddExportPolicyRequest {
     /// ASN of the router to apply the export policy to.
@@ -196,12 +170,6 @@ pub struct Withdraw4Request {
     pub prefixes: Vec<Prefix4>,
 }
 
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-pub struct AsnSelector {
-    /// ASN of the router to get imported prefixes from.
-    pub asn: u32,
-}
-
 #[derive(Debug, Deserialize, Serialize, JsonSchema)]
 pub struct GracefulShutdownRequest {
     /// ASN of the router to gracefully shut down.
@@ -216,18 +184,6 @@ pub struct GetOriginated4Request {
     pub asn: u32,
 }
 
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-pub struct BestpathFanoutRequest {
-    /// Maximum number of equal-cost paths for ECMP forwarding
-    pub fanout: NonZeroU8,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema)]
-pub struct BestpathFanoutResponse {
-    /// Current maximum number of equal-cost paths for ECMP forwarding
-    pub fanout: NonZeroU8,
-}
-
 #[derive(Debug, Deserialize, Serialize, JsonSchema)]
 pub struct GetRoutersRequest {}
 
@@ -263,6 +219,18 @@ pub struct PeerInfo {
     pub timers: PeerTimers,
 }
 
+#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
+pub struct CheckerSource {
+    pub asn: u32,
+    pub code: String,
+}
+
+#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
+pub struct ShaperSource {
+    pub asn: u32,
+    pub code: String,
+}
+
 /// Apply changes to an ASN.
 #[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
 pub struct ApplyRequest {
@@ -314,31 +282,9 @@ pub struct BgpPeerConfig {
     pub vlan_id: Option<u16>,
 }
 
-#[derive(Debug, Deserialize, JsonSchema, Clone)]
-pub struct MessageHistoryRequest {
-    pub asn: u32,
-}
-
-#[derive(Debug, Serialize, JsonSchema, Clone)]
-pub struct MessageHistoryResponse {
-    pub by_peer: HashMap<IpAddr, MessageHistory>,
-}
-
 #[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
 pub struct Rib(BTreeMap<String, BTreeSet<Path>>);
 
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-pub struct CheckerSource {
-    pub asn: u32,
-    pub code: String,
-}
-
-#[derive(Debug, Deserialize, Serialize, JsonSchema, Clone)]
-pub struct ShaperSource {
-    pub asn: u32,
-    pub code: String,
-}
-
 pub enum PolicySource {
     Checker(String),
     Shaper(String),

mgd/src/bgp_param.rs renamed to bgp/src/params.rs

@@ -0,0 +1,12 @@
+[package]
+name = "mg-api"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+bfd = { path = "../bfd" }
+bgp = { path = "../bgp" }
+dropshot.workspace = true
+rdb = { path = "../rdb" }
+schemars.workspace = true
+serde.workspace = true