vlan plumbing

Cargo.toml

@@ -100,12 +100,12 @@ rev = "7ee353a470ea59529ee1b34729681da887aa88ce"
 
 [workspace.dependencies.dpd-client]
 git = "https://github.com/oxidecomputer/dendrite"
-branch = "main"
+branch = "vlan"
 package = "dpd-client"
 
 [workspace.dependencies.dendrite-common]
 git = "https://github.com/oxidecomputer/dendrite"
-branch = "main"
+branch = "vlan"
 package = "common"
 
 [patch."https://github.com/oxidecomputer/netadm-sys"]

bgp/src/session.rs

@@ -378,6 +378,9 @@ pub struct SessionInfo {
 
     /// Policy governing exported routes.
     pub allow_export: ImportExportPolicy,
+
+    /// Vlan tag to assign to data plane routes created by this session.
+    pub vlan_id: Option<u16>,
 }
 
 impl SessionInfo {
@@ -2074,6 +2077,7 @@ impl<Cnx: BgpConnection + 'static> SessionRunner<Cnx> {
                         id,
                         as_path,
                     }),
+                    vlan_id: lock!(self.session).vlan_id,
                 };
 
                 if let Err(e) =

ddm/src/sys.rs

@@ -220,6 +220,7 @@ pub fn add_routes_dendrite(
             port_id,
             link_id,
             tgt_ip: gw,
+            vlan_id: None,
         };
         let route_set = types::RouteSet {
             cidr: cidr.into(),

mg-lower/src/dendrite.rs

@@ -34,6 +34,7 @@ pub(crate) struct RouteHash {
     pub(crate) port_id: PortId,
     pub(crate) link_id: types::LinkId,
     pub(crate) nexthop: IpAddr,
+    pub(crate) vlan_id: Option<u16>,
 }
 
 impl RouteHash {
@@ -42,6 +43,7 @@ impl RouteHash {
         port_id: PortId,
         link_id: types::LinkId,
         nexthop: IpAddr,
+        vlan_id: Option<u16>,
     ) -> Result<Self, &'static str> {
         match (cidr, nexthop) {
             (Cidr::V4(_), IpAddr::V4(_)) | (Cidr::V6(_), IpAddr::V6(_)) => {
@@ -50,6 +52,7 @@ impl RouteHash {
                     port_id,
                     link_id,
                     nexthop,
+                    vlan_id,
                 })
             }
             _ => Err("mismatched subnet and target"),
@@ -77,6 +80,7 @@ impl RouteHash {
             port_id,
             link_id,
             nexthop: path.nexthop,
+            vlan_id: path.vlan_id,
         };
 
         Ok(rh)
@@ -166,6 +170,7 @@ where
         let tag = dpd.inner().tag.clone();
         let port_id = r.port_id;
         let link_id = r.link_id;
+        let vlan_id = r.vlan_id;
 
         let target = match (r.cidr, r.nexthop) {
             (Cidr::V4(c), IpAddr::V4(tgt_ip)) => {
@@ -191,6 +196,7 @@ where
                     port_id,
                     link_id,
                     tgt_ip,
+                    vlan_id,
                 }
                 .into()
             }
@@ -217,6 +223,7 @@ where
                     port_id,
                     link_id,
                     tgt_ip,
+                    vlan_id,
                 }
                 .into()
             }
@@ -360,6 +367,7 @@ pub(crate) fn get_routes_for_prefix(
                     r.port_id,
                     r.link_id,
                     r.tgt_ip.into(),
+                    r.vlan_id,
                 ) {
                     Ok(rh) => result.push(rh),
                     Err(e) => {
@@ -380,6 +388,7 @@ pub(crate) fn get_routes_for_prefix(
                         r.port_id,
                         r.link_id,
                         r.tgt_ip.into(),
+                        r.vlan_id,
                     )
                     .unwrap()
                 })
@@ -402,6 +411,7 @@ pub(crate) fn get_routes_for_prefix(
                         r.port_id,
                         r.link_id,
                         r.tgt_ip.into(),
+                        r.vlan_id,
                     )
                     .unwrap()
                 })

mgadm/src/bgp.rs

@@ -405,6 +405,9 @@ pub struct Neighbor {
     #[arg(long)]
     pub enforce_first_as: bool,
 
+    #[arg(long)]
+    pub vlan_id: u16,
+
     /// Autonomous system number for the router to add the neighbor to.
     #[clap(env)]
     pub asn: u32,

mgadm/src/static_routing.rs

@@ -33,6 +33,7 @@ pub enum Ipv4PrefixParseError {
 pub struct StaticRoute4 {
     pub destination: Ipv4Prefix,
     pub nexthop: Ipv4Addr,
+    pub vlan_id: Option<u16>,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -72,6 +73,7 @@ pub async fn commands(command: Commands, client: Client) -> Result<()> {
                             length: route.destination.len,
                         },
                         nexthop: route.nexthop,
+                        vlan_id: route.vlan_id,
                     }],
                 },
             };
@@ -86,6 +88,7 @@ pub async fn commands(command: Commands, client: Client) -> Result<()> {
                             length: route.destination.len,
                         },
                         nexthop: route.nexthop,
+                        vlan_id: route.vlan_id,
                     }],
                 },
             };

mgd/src/bgp_admin.rs

@@ -739,6 +739,7 @@ pub(crate) mod helpers {
             enforce_first_as: rq.enforce_first_as,
             allow_import: rq.allow_import.clone(),
             allow_export: rq.allow_export.clone(),
+            vlan_id: rq.vlan_id,
             ..Default::default()
         };
 
@@ -785,6 +786,7 @@ pub(crate) mod helpers {
             enforce_first_as: rq.enforce_first_as,
             allow_import: rq.allow_import.clone(),
             allow_export: rq.allow_export.clone(),
+            vlan_id: rq.vlan_id,
         })?;
 
         if start_session {