20260519_2 收紧CCR/CIR四文件分诊

This commit is contained in:
2026-05-20 07:07:13 +08:00
parent 8c6fb44352
commit fcd0bac070
11 changed files with 618 additions and 748 deletions

View File

@@ -123,7 +123,7 @@ fn ccr_to_routinator_csv_binary_writes_vrp_csv() {
);
let csv = std::fs::read_to_string(csv_path).expect("read csv");
assert!(csv.contains("ASN,IP Prefix,Max Length,Trust Anchor"));
assert!(csv.contains("AS64496,203.0.113.0/24,24,apnic"));
assert!(csv.contains("AS64496,203.0.113.0/24,24,unknown"));
}
#[test]
@@ -193,9 +193,9 @@ fn ccr_to_compare_views_binary_writes_vrp_and_vap_csvs() {
let vrps_csv = std::fs::read_to_string(vrps_path).expect("read vrps csv");
let vaps_csv = std::fs::read_to_string(vaps_path).expect("read vaps csv");
assert!(vrps_csv.contains("ASN,IP Prefix,Max Length,Trust Anchor"));
assert!(vrps_csv.contains("AS64496,198.51.100.0/24,24,apnic"));
assert!(vrps_csv.contains("AS64496,198.51.100.0/24,24,unknown"));
assert!(vaps_csv.contains("Customer ASN,Providers,Trust Anchor"));
assert!(vaps_csv.contains("AS64496,AS64497;AS64498,apnic"));
assert!(vaps_csv.contains("AS64496,AS64497;AS64498,unknown"));
}
#[test]

View File

@@ -57,7 +57,7 @@ fn run_case(
.expect("parse report");
let ccr = rpki::ccr::decode_content_info(&std::fs::read(&ccr_path).expect("read ccr"))
.expect("decode ccr");
let (vrps, vaps) = decode_ccr_compare_views(&ccr, "multi").expect("compare views");
let (vrps, vaps) = decode_ccr_compare_views(&ccr).expect("compare views");
(report, vrps, vaps, ccr)
}

View File

@@ -64,10 +64,9 @@ fn offline_default_parallel_and_configured_phase2_match_compare_views() {
rpki::ccr::decode_content_info(&configured_ccr_bytes).expect("decode configured ccr");
let (default_vrps, default_vaps) =
rpki::ccr::decode_ccr_compare_views(&default_ccr, "apnic").expect("default compare view");
rpki::ccr::decode_ccr_compare_views(&default_ccr).expect("default compare view");
let (configured_vrps, configured_vaps) =
rpki::ccr::decode_ccr_compare_views(&configured_ccr, "apnic")
.expect("configured compare view");
rpki::ccr::decode_ccr_compare_views(&configured_ccr).expect("configured compare view");
assert_eq!(
default_vrps, configured_vrps,
@@ -95,7 +94,7 @@ fn offline_default_parallel_and_configured_phase2_match_compare_views() {
fn offline_default_parallel_emits_online_ccr_accumulator_output() {
let (report, ccr_bytes) = run_offline_case(None);
let ccr = rpki::ccr::decode_content_info(&ccr_bytes).expect("decode ccr");
let (_vrps, _vaps) = rpki::ccr::decode_ccr_compare_views(&ccr, "apnic").expect("compare view");
let (_vrps, _vaps) = rpki::ccr::decode_ccr_compare_views(&ccr).expect("compare view");
assert!(
report["publication_points"]
.as_array()