feat(mgmt): switch to RouteTableId

We need to unify some basic types between vpc/interface manager and the mgmt crate in order to integrate them properly.

This commit switches the unchecked `u32` into a `RouteTableId` in order to make that process easier.

Signed-off-by: Daniel Noland <daniel@githedgehog.com>

Author: daniel-noland

mgmt/src/models/internal/routing/vrf.rs

@@ -3,11 +3,11 @@
 
 //! Dataplane configuration model: VRFs
 
-use std::collections::BTreeSet;
-
 use crate::models::internal::{InterfaceConfig, InterfaceConfigTable};
+use net::route::RouteTableId;
 use net::vxlan::Vni;
 use routing::prefix::Prefix;
+use std::collections::BTreeSet;
 
 use super::bgp::BgpConfig;
 use super::ospf::Ospf;
@@ -18,7 +18,7 @@ use super::statics::StaticRoute;
 pub struct VrfConfig {
     pub name: String,
     pub default: bool,
-    pub tableid: Option<u32>,
+    pub tableid: Option<RouteTableId>,
     pub vni: Option<Vni>,
     pub subnets: BTreeSet<Prefix>,
     pub static_routes: BTreeSet<StaticRoute>,
@@ -53,7 +53,7 @@ impl VrfConfig {
             ..Default::default()
         }
     }
-    pub fn set_table_id(mut self, tableid: u32) -> Self {
+    pub fn set_table_id(mut self, tableid: RouteTableId) -> Self {
         if self.default {
             panic!("Can't set table id for default vrf");
         }

mgmt/src/processor/confbuild.rs

@@ -4,6 +4,7 @@
 #[allow(unused)]
 use tracing::{debug, error, warn};
 
+use net::route::RouteTableId;
 use routing::prefix::Prefix;
 use std::net::Ipv4Addr;
 
@@ -156,7 +157,8 @@ fn vpc_vrf_config(vpc: &Vpc, asn: u32, router_id: Option<Ipv4Addr>) -> VrfConfig
     /* set table-id: table ids should be unique per VRF. We should track them and pick unused ones.
     Setting this to the VNI is not too bad atm, except that we should avoid picking reserved values
     which may cause internal failures. FIXME: fredi */
-    vrf_cfg = vrf_cfg.set_table_id(vpc.vni.as_u32());
+    // TODO: we can't just unwrap here
+    vrf_cfg = vrf_cfg.set_table_id(RouteTableId::try_from(vpc.vni.as_u32()).unwrap());
 
     /* build BGP config for vrf */
     vrf_cfg.set_bgp(vpc_vrf_bgp_config(vpc, asn, router_id));