feat: Remove legacy dst_vpcd_lookup stage

Now that we've transitioned to the new, more powerful/accurate
flow-filter stage for looking up the destination VPC discriminant for
packets, remove the legacy, redundant dst_vpcd_lookup stage.

Signed-off-by: Quentin Monnet <[email protected]>

Author: qmonnet

Cargo.lock

@@ -154,7 +154,6 @@ fn main() {
             vpcmapw: setup.vpcmapw,
             nattablesw: setup.nattablesw,
             natallocatorw: setup.natallocatorw,
-            vpcdtablesw: setup.vpcdtablesw,
             flowfilterw: setup.flowfiltertablesw,
             vpc_stats_store: setup.vpc_stats_store,
         },

dataplane/src/main.rs

@@ -13,7 +13,6 @@ use super::packet_processor::ipforward::IpForwarder;
 use concurrency::sync::Arc;
 
 use flow_filter::{FlowFilter, FlowFilterTableWriter};
-use pkt_meta::dst_vpcd_lookup::{DstVpcdLookup, VpcDiscTablesWriter};
 use pkt_meta::flow_table::{ExpirationsNF, FlowTable, LookupNF};
 
 use nat::stateful::NatAllocatorWriter;
@@ -39,7 +38,6 @@ where
     pub vpcmapw: VpcMapWriter<VpcMapName>,
     pub nattablesw: NatTablesWriter,
     pub natallocatorw: NatAllocatorWriter,
-    pub vpcdtablesw: VpcDiscTablesWriter,
     pub flowfiltertablesw: FlowFilterTableWriter,
     pub stats: StatsCollector,
     pub vpc_stats_store: Arc<VpcStatsStore>,
@@ -51,7 +49,6 @@ pub(crate) fn start_router<Buf: PacketBufferMut>(
 ) -> Result<InternalSetup<Buf>, RouterError> {
     let nattablesw = NatTablesWriter::new();
     let natallocatorw = NatAllocatorWriter::new();
-    let vpcdtablesw = VpcDiscTablesWriter::new();
     let flowfiltertablesw = FlowFilterTableWriter::new();
     let router = Router::new(params)?;
     let vpcmapw = VpcMapWriter::<VpcMapName>::new();
@@ -68,7 +65,6 @@ pub(crate) fn start_router<Buf: PacketBufferMut>(
 
     let iftr_factory = router.get_iftabler_factory();
     let fibtr_factory = router.get_fibtr_factory();
-    let vpcdtablesr_factory = vpcdtablesw.get_reader_factory();
     let flowfiltertablesr_factory = flowfiltertablesw.get_reader_factory();
     let atabler_factory = router.get_atabler_factory();
     let nattabler_factory = nattablesw.get_reader_factory();
@@ -78,7 +74,6 @@ pub(crate) fn start_router<Buf: PacketBufferMut>(
         // Build network functions
         let stage_ingress = Ingress::new("Ingress", iftr_factory.handle());
         let stage_egress = Egress::new("Egress", iftr_factory.handle(), atabler_factory.handle());
-        let dst_vpcd_lookup = DstVpcdLookup::new("dst-vni-lookup", vpcdtablesr_factory.handle());
         let iprouter1 = IpForwarder::new("IP-Forward-1", fibtr_factory.handle());
         let iprouter2 = IpForwarder::new("IP-Forward-2", fibtr_factory.handle());
         let stateless_nat = StatelessNat::with_reader("stateless-NAT", nattabler_factory.handle());
@@ -98,7 +93,6 @@ pub(crate) fn start_router<Buf: PacketBufferMut>(
         DynPipeline::new()
             .add_stage(stage_ingress)
             .add_stage(iprouter1)
-            .add_stage(dst_vpcd_lookup)
             .add_stage(flow_lookup_nf)
             .add_stage(flow_filter)
             .add_stage(stateless_nat)
@@ -116,7 +110,6 @@ pub(crate) fn start_router<Buf: PacketBufferMut>(
         vpcmapw,
         nattablesw,
         natallocatorw,
-        vpcdtablesw,
         flowfiltertablesw,
         stats,
         vpc_stats_store,

dataplane/src/packet_processor/mod.rs

@@ -28,7 +28,6 @@ k8s-less = { workspace = true }
 lpm = { workspace = true }
 nat = { workspace = true }
 net = { workspace = true }
-pkt-meta = { workspace = true }
 rekon = { workspace = true }
 routing = { workspace = true }
 stats = { workspace = true }

mgmt/Cargo.toml

@@ -23,8 +23,6 @@ use flow_filter::{FlowFilterTable, FlowFilterTableWriter};
 use nat::stateful::NatAllocatorWriter;
 use nat::stateless::NatTablesWriter;
 use nat::stateless::setup::build_nat_configuration;
-use pkt_meta::dst_vpcd_lookup::VpcDiscTablesWriter;
-use pkt_meta::dst_vpcd_lookup::setup::build_dst_vni_lookup_configuration;
 
 use crate::processor::display::ConfigHistory;
 use crate::processor::gwconfigdb::GwConfigDatabase;
@@ -82,9 +80,6 @@ pub struct ConfigProcessorParams {
     // writer for stateful NAT allocator
     pub natallocatorw: NatAllocatorWriter,
 
-    // writer for VPC routing table
-    pub vpcdtablesw: VpcDiscTablesWriter,
-
     // writer for flow filter table
     pub flowfilterw: FlowFilterTableWriter,
 
@@ -486,16 +481,6 @@ fn apply_stateful_nat_config(
     Ok(())
 }
 
-/// Update the VNI tables for dst_vni_lookup
-fn apply_dst_vpcd_lookup_config(
-    overlay: &Overlay,
-    vpcdtablesw: &mut VpcDiscTablesWriter,
-) -> ConfigResult {
-    let vpcd_tables = build_dst_vni_lookup_configuration(overlay)?;
-    vpcdtablesw.update_vpcd_tables(vpcd_tables);
-    Ok(())
-}
-
 fn apply_flow_filtering_config(
     overlay: &Overlay,
     flowfilterw: &mut FlowFilterTableWriter,
@@ -535,7 +520,6 @@ impl ConfigProcessor {
         let vpcmapw = &mut self.proc_params.vpcmapw;
         let nattablesw = &mut self.proc_params.nattablesw;
         let natallocatorw = &mut self.proc_params.natallocatorw;
-        let vpcdtablesw = &mut self.proc_params.vpcdtablesw;
         let flowfilterw = &mut self.proc_params.flowfilterw;
 
         /* build internal config if it hasn't been built */
@@ -573,9 +557,6 @@ impl ConfigProcessor {
         /* apply stateful NAT config */
         apply_stateful_nat_config(&config.external.overlay.vpc_table, natallocatorw)?;
 
-        /* apply dst_vpcd_lookup config */
-        apply_dst_vpcd_lookup_config(&config.external.overlay, vpcdtablesw)?;
-
         /* apply flow filtering config */
         apply_flow_filtering_config(&config.external.overlay, flowfilterw)?;
 

mgmt/src/processor/proc.rs

@@ -17,7 +17,6 @@ pub mod test {
     use nat::stateless::NatTablesWriter;
     use net::eth::mac::Mac;
     use net::interface::Mtu;
-    use pkt_meta::dst_vpcd_lookup::VpcDiscTablesWriter;
     use std::net::IpAddr;
     use std::net::Ipv4Addr;
     use std::str::FromStr;
@@ -429,9 +428,6 @@ pub mod test {
         /* create NatAllocator for stateful nat */
         let natallocatorw = NatAllocatorWriter::new();
 
-        /* create VniTables for dst_vni_lookup */
-        let vpcdtablesw = VpcDiscTablesWriter::new();
-
         /* create FlowFilterTable for flow filtering */
         let flowfilterw = FlowFilterTableWriter::new();
 
@@ -444,7 +440,6 @@ pub mod test {
             vpcmapw,
             nattablesw,
             natallocatorw,
-            vpcdtablesw,
             flowfilterw,
             vpc_stats_store,
         };

mgmt/src/tests/mgmt.rs

@@ -14,6 +14,7 @@ arc-swap = { workspace = true }
 bnum = { workspace = true }
 concurrency = { workspace = true, features = [] }
 config = { workspace = true }
+flow-filter = { workspace = true }
 flow-info = { workspace = true }
 left-right = { workspace = true }
 linkme = { workspace = true }

nat/Cargo.toml

@@ -23,6 +23,7 @@ mod tests {
     use config::{ConfigError, GwConfig};
     use etherparse::Icmpv4Type;
     use fixin::wrap;
+    use flow_filter::{FlowFilter, FlowFilterTable, FlowFilterTableWriter};
     use net::buffer::{PacketBufferMut, TestBuffer};
     use net::eth::mac::Mac;
     use net::headers::{
@@ -39,8 +40,6 @@ mod tests {
     use net::udp::{TruncatedUdp, UdpPort};
     use net::vxlan::Vni;
     use pipeline::NetworkFunction;
-    use pkt_meta::dst_vpcd_lookup::setup::build_dst_vni_lookup_configuration;
-    use pkt_meta::dst_vpcd_lookup::{DstVpcdLookup, VpcDiscTablesWriter};
     use pkt_meta::flow_table::flow_key::Uni;
     use pkt_meta::flow_table::{FlowKey, FlowTable, IpProtoKey, LookupNF, UdpProtoKey};
     use std::net::{IpAddr, Ipv4Addr};
@@ -1175,7 +1174,7 @@ mod tests {
     #[allow(clippy::too_many_arguments)]
     fn check_packet_with_vpcd_lookup(
         nat: &mut StatefulNat,
-        vpcdlookup: &mut DstVpcdLookup,
+        vpcdlookup: &mut FlowFilter,
         flow_lookup_stage: Option<&mut LookupNF>,
         src_vni: Vni,
         src_ip: &str,
@@ -1254,10 +1253,10 @@ mod tests {
         config.validate().unwrap();
 
         // Build VPC discriminant lookup stage
-        let vpcd_tables = build_dst_vni_lookup_configuration(&config.external.overlay).unwrap();
-        let mut vpcdtablesw = VpcDiscTablesWriter::new();
-        vpcdtablesw.update_vpcd_tables(vpcd_tables);
-        let mut vpcdlookup = DstVpcdLookup::new("vpcd-lookup", vpcdtablesw.get_reader());
+        let vpcd_tables = FlowFilterTable::build_from_overlay(&config.external.overlay).unwrap();
+        let mut vpcdtablesw = FlowFilterTableWriter::new();
+        vpcdtablesw.update_flow_filter_table(vpcd_tables);
+        let mut vpcdlookup = FlowFilter::new("vpcd-lookup", vpcdtablesw.get_reader());
 
         /////////////////////////////////////////////////////////////////
         // First NAT stage: We do not search for the destination VPC discriminant in the flow table.
@@ -1551,10 +1550,10 @@ mod tests {
         );
 
         // Build VPC discriminant lookup stage
-        let vpcd_tables = build_dst_vni_lookup_configuration(&config.external.overlay).unwrap();
-        let mut vpcdtablesw = VpcDiscTablesWriter::new();
-        vpcdtablesw.update_vpcd_tables(vpcd_tables);
-        let mut vpcdlookup = DstVpcdLookup::new("vpcd-lookup", vpcdtablesw.get_reader());
+        let vpcd_tables = FlowFilterTable::build_from_overlay(&config.external.overlay).unwrap();
+        let mut vpcdtablesw = FlowFilterTableWriter::new();
+        vpcdtablesw.update_flow_filter_table(vpcd_tables);
+        let mut vpcdlookup = FlowFilter::new("vpcd-lookup", vpcdtablesw.get_reader());
 
         // Build flow table lookup stage
         let flow_table = Arc::new(FlowTable::default());