rm single export cases and ignore it

Author: SichangHe

route_verification/bgp/src/cmp.rs

@@ -62,10 +62,11 @@ impl Compare {
     /// Check `self` against RPSL policy `query` and generate reports.
     /// Depending on which [`Verbosity`] `self.verbosity` is set to,
     /// the reports have different levels of details.
-    /// If `verbosity.stop_at_first`, stops at the first report.
+    /// - If `verbosity.stop_at_first`, stops at the first report.
+    /// - Skip generating reports if the AS Path has only one entry.
     pub fn check(&self, query: &QueryIr) -> Vec<Report> {
-        if self.as_path.len() == 1 {
-            return self.check_last_export(query).into_iter().collect();
+        if self.as_path.len() <= 1 {
+            return vec![];
         }
 
         let mut reports = Vec::with_capacity(self.as_path.len() << 1);
@@ -91,22 +92,6 @@ impl Compare {
         reports
     }
 
-    pub fn check_last_export(&self, query: &QueryIr) -> Option<Report> {
-        match self.as_path.last()? {
-            Seq(from) => match query.aut_nums.get(from) {
-                Some(from_an) => self.check_export(query, from_an, *from, None, &[]),
-                None => self.verbosity.show_unrec.then(|| {
-                    let items = aut_num_unrecorded_items(*from);
-                    UnrecSingleExport { from: *from, items }
-                }),
-            },
-            Set(from) => self
-                .verbosity
-                .record_set
-                .then(|| SetSingleExport { from: from.clone() }),
-        }
-    }
-
     /// `prev_path` is previous path for `to`.
     pub fn check_pair(
         &self,
@@ -116,7 +101,7 @@ impl Compare {
         prev_path: &[AsPathEntry],
     ) -> Vec<Report> {
         let from_report = match query.aut_nums.get(&from) {
-            Some(from_an) => self.check_export(query, from_an, from, Some(to), prev_path),
+            Some(from_an) => self.check_export(query, from_an, from, to, prev_path),
             None => self.verbosity.show_unrec.then(|| {
                 let items = aut_num_unrecorded_items(from);
                 UnrecExport { from, to, items }
@@ -141,16 +126,13 @@ impl Compare {
         query: &QueryIr,
         from_an: &AutNum,
         from: u32,
-        to: Option<u32>,
+        to: u32,
         prev_path: &[AsPathEntry],
     ) -> Option<Report> {
         if from_an.exports.is_default() {
             return self.verbosity.show_unrec.then(|| {
                 let items = vec![UnrecExportEmpty];
-                match to {
-                    Some(to) => UnrecExport { from, to, items },
-                    None => UnrecSingleExport { from, items },
-                }
+                UnrecExport { from, to, items }
             });
         }
         let mut report = match (Compliance {
@@ -163,32 +145,26 @@ impl Compare {
         })
         .check(&from_an.exports)
         {
-            None => {
-                return self.verbosity.show_success.then_some(match to {
-                    Some(to) => OkExport { from, to },
-                    None => OkSingleExport { from },
-                })
-            }
+            None => return self.verbosity.show_success.then_some(OkExport { from, to }),
             Some(report) => report,
         };
         report.shrink_to_fit();
         match report {
-            SkipAnyReport(items) => self.verbosity.show_skips.then_some(match to {
-                Some(to) => SkipExport { from, to, items },
-                None => SkipSingleExport { from, items },
-            }),
-            UnrecAnyReport(items) => self.verbosity.show_unrec.then_some(match to {
-                Some(to) => UnrecExport { from, to, items },
-                None => UnrecSingleExport { from, items },
-            }),
-            MehAnyReport(items) => self.verbosity.show_meh.then_some(match to {
-                Some(to) => MehExport { from, to, items },
-                None => MehSingleExport { from, items },
-            }),
-            BadAnyReport(items) => Some(match to {
-                Some(to) => BadExport { from, to, items },
-                None => BadSingleExport { from, items },
-            }),
+            SkipAnyReport(items) => {
+                self.verbosity
+                    .show_skips
+                    .then_some(SkipExport { from, to, items })
+            }
+            UnrecAnyReport(items) => {
+                self.verbosity
+                    .show_unrec
+                    .then_some(UnrecExport { from, to, items })
+            }
+            MehAnyReport(items) => self
+                .verbosity
+                .show_meh
+                .then_some(MehExport { from, to, items }),
+            BadAnyReport(items) => Some(BadExport { from, to, items }),
         }
     }
 
@@ -210,7 +186,7 @@ impl Compare {
         let mut report = match (Compliance {
             cmp: self,
             query,
-            accept_num: Some(from),
+            accept_num: from,
             self_num: to,
             export: false,
             prev_path,

route_verification/bgp/src/cmp/compliance.rs

@@ -3,7 +3,7 @@ use super::*;
 pub struct Compliance<'a> {
     pub cmp: &'a Compare,
     pub query: &'a QueryIr,
-    pub accept_num: Option<u32>,
+    pub accept_num: u32,
     pub self_num: u32,
     pub export: bool,
     pub prev_path: &'a [AsPathEntry],
@@ -32,21 +32,18 @@ impl<'a> Compliance<'a> {
     }
 
     pub fn check_entry(&self, entry: &Entry) -> AllReport {
-        let peering_report = match self.accept_num {
-            Some(accept_num) => CheckPeering {
-                c: self,
-                accept_num,
+        let peering_report = CheckPeering {
+            c: self,
+            accept_num: self.accept_num,
+        }
+        .check_peering_actions(&entry.mp_peerings)
+        .to_all()
+        .map_err(|mut report| {
+            if self.cmp.verbosity.per_peering_err {
+                report.push(MatchPeering);
             }
-            .check_peering_actions(&entry.mp_peerings)
-            .to_all()
-            .map_err(|mut report| {
-                if self.cmp.verbosity.per_peering_err {
-                    report.push(MatchPeering);
-                }
-                report
-            })?,
-            None => OkAllReport,
-        };
+            report
+        })?;
         let filter_report = CheckFilter {
             cmp: self.cmp,
             query: self.query,

route_verification/bgp/src/report.rs

@@ -25,9 +25,6 @@ pub enum Report {
         from: u32,
         to: u32,
     },
-    OkSingleExport {
-        from: u32,
-    },
     SkipImport {
         from: u32,
         to: u32,
@@ -38,10 +35,6 @@ pub enum Report {
         to: u32,
         items: ReportItems,
     },
-    SkipSingleExport {
-        from: u32,
-        items: ReportItems,
-    },
     UnrecImport {
         from: u32,
         to: u32,
@@ -52,17 +45,10 @@ pub enum Report {
         to: u32,
         items: ReportItems,
     },
-    UnrecSingleExport {
-        from: u32,
-        items: ReportItems,
-    },
     AsPathPairWithSet {
         from: AsPathEntry,
         to: AsPathEntry,
     },
-    SetSingleExport {
-        from: Vec<u32>,
-    },
     MehImport {
         from: u32,
         to: u32,
@@ -73,10 +59,6 @@ pub enum Report {
         to: u32,
         items: ReportItems,
     },
-    MehSingleExport {
-        from: u32,
-        items: ReportItems,
-    },
     BadImport {
         from: u32,
         to: u32,
@@ -87,10 +69,6 @@ pub enum Report {
         to: u32,
         items: ReportItems,
     },
-    BadSingleExport {
-        from: u32,
-        items: ReportItems,
-    },
 }
 
 impl Report {
@@ -105,7 +83,7 @@ impl Report {
                 from: _,
                 to: _,
                 items: _
-            } | MehSingleExport { from: _, items: _ }
+            }
         )
     }
 }

route_verification/bgp/src/stats/as_.rs

@@ -6,15 +6,13 @@ use super::{
 pub fn one(map: &DashMap<u32, RouteStats<u64>>, report: Report) {
     match report {
         OkImport { from: _, to } => map.entry(to).or_default().import_ok += 1,
-        OkExport { from, to: _ } | OkSingleExport { from } => {
-            map.entry(from).or_default().export_ok += 1
-        }
+        OkExport { from, to: _ } => map.entry(from).or_default().export_ok += 1,
         SkipImport { from: _, to, items } => {
             let mut entry = map.entry(to).or_default();
             entry.import_skip += 1;
             skip(&mut entry, items);
         }
-        SkipExport { from, to: _, items } | SkipSingleExport { from, items } => {
+        SkipExport { from, to: _, items } => {
             let mut entry = map.entry(from).or_default();
             entry.export_skip += 1;
             skip(&mut entry, items);
@@ -24,7 +22,7 @@ pub fn one(map: &DashMap<u32, RouteStats<u64>>, report: Report) {
             entry.import_unrec += 1;
             unrec(&mut entry, items);
         }
-        UnrecExport { from, to: _, items } | UnrecSingleExport { from, items } => {
+        UnrecExport { from, to: _, items } => {
             let mut entry = map.entry(from).or_default();
             entry.export_unrec += 1;
             unrec(&mut entry, items);
@@ -34,7 +32,7 @@ pub fn one(map: &DashMap<u32, RouteStats<u64>>, report: Report) {
             entry.import_err += 1;
             bad(&mut entry, items);
         }
-        BadExport { from, to: _, items } | BadSingleExport { from, items } => {
+        BadExport { from, to: _, items } => {
             let mut entry = map.entry(from).or_default();
             entry.export_err += 1;
             bad(&mut entry, items);
@@ -44,11 +42,11 @@ pub fn one(map: &DashMap<u32, RouteStats<u64>>, report: Report) {
             entry.import_meh += 1;
             meh(&mut entry, items);
         }
-        MehExport { from, to: _, items } | MehSingleExport { from, items } => {
+        MehExport { from, to: _, items } => {
             let mut entry = map.entry(from).or_default();
             entry.export_meh += 1;
             meh(&mut entry, items);
         }
-        AsPathPairWithSet { from: _, to: _ } | SetSingleExport { from: _ } => (),
+        AsPathPairWithSet { from: _, to: _ } => (),
     }
 }

route_verification/bgp/src/stats/as_pair.rs

@@ -52,13 +52,7 @@ pub fn one(db: &AsRelDb, map: &DashMap<(u32, u32), AsPairStats>, report: Report)
             entry.route_stats.export_meh += 1;
             meh(&mut entry.route_stats, items)
         }
-        AsPathPairWithSet { from: _, to: _ }
-        | SetSingleExport { from: _ }
-        | OkSingleExport { from: _ }
-        | SkipSingleExport { from: _, items: _ }
-        | UnrecSingleExport { from: _, items: _ }
-        | MehSingleExport { from: _, items: _ }
-        | BadSingleExport { from: _, items: _ } => (),
+        AsPathPairWithSet { from: _, to: _ } => (),
     }
 }
 

route_verification/bgp/src/stats/route.rs

@@ -4,7 +4,7 @@ use ReportItem::*;
 pub fn one(stats: &mut RouteStats<u16>, report: Report) {
     match report {
         OkImport { from: _, to: _ } => stats.import_ok.inc(),
-        OkExport { from: _, to: _ } | OkSingleExport { from: _ } => stats.export_ok.inc(),
+        OkExport { from: _, to: _ } => stats.export_ok.inc(),
         SkipImport {
             from: _,
             to: _,
@@ -17,8 +17,7 @@ pub fn one(stats: &mut RouteStats<u16>, report: Report) {
             from: _,
             to: _,
             items,
-        }
-        | SkipSingleExport { from: _, items } => {
+        } => {
             stats.export_skip.inc();
             skip(stats, items);
         }
@@ -34,8 +33,7 @@ pub fn one(stats: &mut RouteStats<u16>, report: Report) {
             from: _,
             to: _,
             items,
-        }
-        | UnrecSingleExport { from: _, items } => {
+        } => {
             stats.export_unrec.inc();
             unrec(stats, items);
         }
@@ -51,8 +49,7 @@ pub fn one(stats: &mut RouteStats<u16>, report: Report) {
             from: _,
             to: _,
             items,
-        }
-        | BadSingleExport { from: _, items } => {
+        } => {
             stats.export_err.inc();
             bad(stats, items);
         }
@@ -68,12 +65,11 @@ pub fn one(stats: &mut RouteStats<u16>, report: Report) {
             from: _,
             to: _,
             items,
-        }
-        | MehSingleExport { from: _, items } => {
+        } => {
             stats.export_meh.inc();
             meh(stats, items);
         }
-        AsPathPairWithSet { from: _, to: _ } | SetSingleExport { from: _ } => (),
+        AsPathPairWithSet { from: _, to: _ } => (),
     }
 }
 

route_verification/bgp/src/stats/up_down_hill.rs

@@ -14,7 +14,6 @@ pub fn one(stats: &mut UpDownHillStats, report: &Report, db: &AsRelDb) {
             Some(C2P) => stats.ok_up_export += 1,
             None => stats.ok_other_export += 1,
         },
-        OkSingleExport { from: _ } => stats.ok_other_export += 1,
         SkipImport { from, to, items: _ } | UnrecImport { from, to, items: _ } => {
             match db.get(*from, *to) {
                 Some(P2C) => stats.skip_down_import += 1,
@@ -31,9 +30,6 @@ pub fn one(stats: &mut UpDownHillStats, report: &Report, db: &AsRelDb) {
                 None => stats.skip_other_export += 1,
             }
         }
-        SkipSingleExport { from: _, items: _ } | UnrecSingleExport { from: _, items: _ } => {
-            stats.skip_other_export += 1
-        }
         BadImport { from, to, items: _ } | MehImport { from, to, items: _ } => {
             match db.get(*from, *to) {
                 Some(P2C) => stats.bad_down_import += 1,
@@ -50,10 +46,7 @@ pub fn one(stats: &mut UpDownHillStats, report: &Report, db: &AsRelDb) {
                 None => stats.bad_other_export += 1,
             }
         }
-        BadSingleExport { from: _, items: _ } | MehSingleExport { from: _, items: _ } => {
-            stats.bad_other_export += 1
-        }
-        AsPathPairWithSet { from: _, to: _ } | SetSingleExport { from: _ } => (),
+        AsPathPairWithSet { from: _, to: _ } => (),
     }
 }
 

route_verification/src/evcxr_examples/filter_as.rs

@@ -41,7 +41,7 @@ fn reports_for_paths_containing_certain_as(
                                 from: _,
                                 to: _,
                                 items: _,
-                            } | Report::SkipSingleExport { from: _, items: _ }
+                            }
                         )
                     })
                     .then(|| line.display_str())