Skip to content

Commit

Permalink
Merge pull request FRRouting#17226 from louis-6wind/fix-bmp-tests
Browse files Browse the repository at this point in the history
tests: fix bmp tests random failure
  • Loading branch information
riw777 authored Oct 29, 2024
2 parents b5c3b44 + a235dbc commit 574a715
Show file tree
Hide file tree
Showing 34 changed files with 1,200 additions and 163 deletions.
34 changes: 34 additions & 0 deletions tests/topotests/bgp_bmp/bmp1/bmp-update-loc-rib-step1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"loc-rib": {
"update": {
"172.31.0.15/32": {
"as_path": "65501 65502",
"bgp_nexthop": "192.168.0.2",
"bmp_log_type": "update",
"ip_prefix": "172.31.0.15/32",
"is_filtered": false,
"origin": "IGP",
"peer_asn": 65501,
"peer_bgp_id": "192.168.0.1",
"peer_distinguisher": "0:0",
"peer_type": "loc-rib instance",
"policy": "loc-rib"
},
"2001::1111/128": {
"afi": 2,
"as_path": "65501 65502",
"bmp_log_type": "update",
"ip_prefix": "2001::1111/128",
"is_filtered": false,
"nxhp_ip": "192:168::2",
"origin": "IGP",
"peer_asn": 65501,
"peer_bgp_id": "192.168.0.1",
"peer_distinguisher": "0:0",
"peer_type": "loc-rib instance",
"policy": "loc-rib",
"safi": 1
}
}
}
}
43 changes: 43 additions & 0 deletions tests/topotests/bgp_bmp/bmp1/bmp-update-loc-rib-step2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"loc-rib": {
"update": {
"2001::1111/128": {
"afi": 2,
"as_path": "65501 65502",
"bmp_log_type": "update",
"ip_prefix": "2001::1111/128",
"is_filtered": false,
"label": 105,
"nxhp_ip": "192:168::2",
"nxhp_rd1": "0:0",
"nxhp_rd2": "0:0",
"origin": "IGP",
"peer_asn": 65501,
"peer_bgp_id": "192.168.0.1",
"peer_distinguisher": "0:0",
"peer_type": "loc-rib instance",
"policy": "loc-rib",
"rd": "555:2",
"safi": 128
},
"172.31.0.15/32": {
"afi": 1,
"as_path": "65501 65502",
"bmp_log_type": "update",
"ip_prefix": "172.31.0.15/32",
"is_filtered": false,
"label": 102,
"nxhp_ip": "192.168.0.2",
"nxhp_rd": "0:0",
"origin": "IGP",
"peer_asn": 65501,
"peer_bgp_id": "192.168.0.1",
"peer_distinguisher": "0:0",
"peer_type": "loc-rib instance",
"policy": "loc-rib",
"rd": "444:2",
"safi": 128
}
}
}
}
36 changes: 36 additions & 0 deletions tests/topotests/bgp_bmp/bmp1/bmp-update-post-policy-step1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"post-policy": {
"update": {
"172.31.0.15/32": {
"as_path": "65501 65502",
"bgp_nexthop": "192.168.0.2",
"bmp_log_type": "update",
"ip_prefix": "172.31.0.15/32",
"ipv6": false,
"origin": "IGP",
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192.168.0.2",
"peer_type": "global instance",
"policy": "post-policy"
},
"2001::1111/128": {
"afi": 2,
"as_path": "65501 65502",
"bmp_log_type": "update",
"ip_prefix": "2001::1111/128",
"ipv6": true,
"nxhp_ip": "192:168::2",
"origin": "IGP",
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192:168::2",
"peer_type": "global instance",
"policy": "post-policy",
"safi": 1
}
}
}
}
45 changes: 45 additions & 0 deletions tests/topotests/bgp_bmp/bmp1/bmp-update-post-policy-step2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"post-policy": {
"update": {
"172.31.0.15/32": {
"afi": 1,
"as_path": "65501 65502",
"bmp_log_type": "update",
"ip_prefix": "172.31.0.15/32",
"ipv6": false,
"label": 102,
"nxhp_ip": "192.168.0.2",
"nxhp_rd": "0:0",
"origin": "IGP",
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192.168.0.2",
"peer_type": "global instance",
"policy": "post-policy",
"rd": "444:2",
"safi": 128
},
"2001::1111/128": {
"afi": 2,
"as_path": "65501 65502",
"bmp_log_type": "update",
"ip_prefix": "2001::1111/128",
"ipv6": true,
"label": 105,
"nxhp_ip": "192:168::2",
"nxhp_rd1": "0:0",
"nxhp_rd2": "0:0",
"origin": "IGP",
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192:168::2",
"peer_type": "global instance",
"policy": "post-policy",
"rd": "555:2",
"safi": 128
}
}
}
}
36 changes: 36 additions & 0 deletions tests/topotests/bgp_bmp/bmp1/bmp-update-pre-policy-step1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"pre-policy": {
"update": {
"172.31.0.15/32": {
"as_path": "65501 65502",
"bgp_nexthop": "192.168.0.2",
"bmp_log_type": "update",
"ip_prefix": "172.31.0.15/32",
"ipv6": false,
"origin": "IGP",
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192.168.0.2",
"peer_type": "global instance",
"policy": "pre-policy"
},
"2001::1111/128": {
"afi": 2,
"as_path": "65501 65502",
"bmp_log_type": "update",
"ip_prefix": "2001::1111/128",
"ipv6": true,
"nxhp_ip": "192:168::2",
"origin": "IGP",
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192:168::2",
"peer_type": "global instance",
"policy": "pre-policy",
"safi": 1
}
}
}
}
45 changes: 45 additions & 0 deletions tests/topotests/bgp_bmp/bmp1/bmp-update-pre-policy-step2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"pre-policy": {
"update": {
"172.31.0.15/32": {
"afi": 1,
"as_path": "65501 65502",
"bmp_log_type": "update",
"ip_prefix": "172.31.0.15/32",
"ipv6": false,
"label": 102,
"nxhp_ip": "192.168.0.2",
"nxhp_rd": "0:0",
"origin": "IGP",
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192.168.0.2",
"peer_type": "global instance",
"policy": "pre-policy",
"rd": "444:2",
"safi": 128
},
"2001::1111/128": {
"afi": 2,
"as_path": "65501 65502",
"bmp_log_type": "update",
"ip_prefix": "2001::1111/128",
"ipv6": true,
"label": 105,
"nxhp_ip": "192:168::2",
"nxhp_rd1": "0:0",
"nxhp_rd2": "0:0",
"origin": "IGP",
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192:168::2",
"peer_type": "global instance",
"policy": "pre-policy",
"rd": "555:2",
"safi": 128
}
}
}
}
28 changes: 28 additions & 0 deletions tests/topotests/bgp_bmp/bmp1/bmp-withdraw-loc-rib-step1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"loc-rib": {
"withdraw": {
"172.31.0.15/32": {
"bmp_log_type": "withdraw",
"ip_prefix": "172.31.0.15/32",
"is_filtered": false,
"peer_asn": 65501,
"peer_bgp_id": "192.168.0.1",
"peer_distinguisher": "0:0",
"peer_type": "loc-rib instance",
"policy": "loc-rib"
},
"2001::1111/128": {
"afi": 2,
"bmp_log_type": "withdraw",
"ip_prefix": "2001::1111/128",
"is_filtered": false,
"peer_asn": 65501,
"peer_bgp_id": "192.168.0.1",
"peer_distinguisher": "0:0",
"peer_type": "loc-rib instance",
"policy": "loc-rib",
"safi": 1
}
}
}
}
34 changes: 34 additions & 0 deletions tests/topotests/bgp_bmp/bmp1/bmp-withdraw-loc-rib-step2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"loc-rib": {
"withdraw": {
"172.31.0.15/32": {
"afi": 1,
"bmp_log_type": "withdraw",
"ip_prefix": "172.31.0.15/32",
"is_filtered": false,
"label": 0,
"peer_asn": 65501,
"peer_bgp_id": "192.168.0.1",
"peer_distinguisher": "0:0",
"peer_type": "loc-rib instance",
"policy": "loc-rib",
"rd": "444:2",
"safi": 128
},
"2001::1111/128": {
"afi": 2,
"bmp_log_type": "withdraw",
"ip_prefix": "2001::1111/128",
"is_filtered": false,
"label": 0,
"peer_asn": 65501,
"peer_bgp_id": "192.168.0.1",
"peer_distinguisher": "0:0",
"peer_type": "loc-rib instance",
"policy": "loc-rib",
"rd": "555:2",
"safi": 128
}
}
}
}
30 changes: 30 additions & 0 deletions tests/topotests/bgp_bmp/bmp1/bmp-withdraw-post-policy-step1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"post-policy": {
"withdraw": {
"172.31.0.15/32": {
"bmp_log_type": "withdraw",
"ip_prefix": "172.31.0.15/32",
"ipv6": false,
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192.168.0.2",
"peer_type": "global instance",
"policy": "post-policy"
},
"2001::1111/128": {
"afi": 2,
"bmp_log_type": "withdraw",
"ip_prefix": "2001::1111/128",
"ipv6": true,
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192:168::2",
"peer_type": "global instance",
"policy": "post-policy",
"safi": 1
}
}
}
}
36 changes: 36 additions & 0 deletions tests/topotests/bgp_bmp/bmp1/bmp-withdraw-post-policy-step2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"post-policy": {
"withdraw": {
"2001::1111/128": {
"afi": 2,
"bmp_log_type": "withdraw",
"ip_prefix": "2001::1111/128",
"ipv6": true,
"label": 0,
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192:168::2",
"peer_type": "global instance",
"policy": "post-policy",
"rd": "555:2",
"safi": 128
},
"172.31.0.15/32": {
"afi": 1,
"bmp_log_type": "withdraw",
"ip_prefix": "172.31.0.15/32",
"ipv6": false,
"label": 0,
"peer_asn": 65502,
"peer_bgp_id": "192.168.0.2",
"peer_distinguisher": "0:0",
"peer_ip": "192.168.0.2",
"peer_type": "global instance",
"policy": "post-policy",
"rd": "444:2",
"safi": 128
}
}
}
}
Loading

0 comments on commit 574a715

Please sign in to comment.