proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 19:10:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8860 from ton31337/fix/aspath_prepend_default-originate

Browse Source 
bgpd: Allow aspath prepending for default-originate with route-maps
This commit is contained in:
Donald Sharp 2021-06-23 10:13:29 -04:00 committed by GitHub
commit 43d985e414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_updgrp_adv.c
View File

@ -829,6 +829,7 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
struct bgp_path_info_extra tmp_pie; struct bgp_path_info_extra tmp_pie;
tmp_attr = *pi->attr; tmp_attr = *pi->attr;
tmp_attr.aspath = attr.aspath;
prep_for_rmap_apply(&tmp_pi, &tmp_pie, dest, pi, prep_for_rmap_apply(&tmp_pi, &tmp_pie, dest, pi,
pi->peer, &tmp_attr); pi->peer, &tmp_attr);
@ -842,7 +843,6 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
continue; continue;
} else { } else {
new_attr = bgp_attr_intern(&tmp_attr); new_attr = bgp_attr_intern(&tmp_attr);
new_attr->aspath = attr.aspath;
subgroup_announce_reset_nhop( subgroup_announce_reset_nhop(
(peer_cap_enhe(peer, afi, safi) (peer_cap_enhe(peer, afi, safi)

1
tests/topotests/bgp_default_route_route_map_match_set/r1/bgpd.conf
View File

@ -12,6 +12,7 @@ bgp community-list standard default seq 5 permit 65000:1
route-map default permit 10 route-map default permit 10
match community default match community default
set metric 123 set metric 123
set as-path prepend 65000 65000 65000
! !
route-map internal permit 10 route-map internal permit 10
set community 65000:1 set community 65000:1

4
tests/topotests/bgp_default_route_route_map_match_set/test_bgp_default-originate_route-map_match_set.py
View File

@ -94,7 +94,9 @@ def test_bgp_default_originate_route_map():
def _bgp_default_route_has_metric(router): def _bgp_default_route_has_metric(router):
output = json.loads(router.vtysh_cmd("show ip bgp 0.0.0.0/0 json")) output = json.loads(router.vtysh_cmd("show ip bgp 0.0.0.0/0 json"))
expected = {"paths": [{"metric": 123}]} expected = {
"paths": [{"aspath": {"string": "65000 65000 65000 65000"}, "metric": 123}]
}
return topotest.json_cmp(output, expected) return topotest.json_cmp(output, expected)
test_func = functools.partial(_bgp_converge, router) test_func = functools.partial(_bgp_converge, router)

1
tests/topotests/bgp_default_route_route_map_set/r1/bgpd.conf
View File

@ -8,4 +8,5 @@ router bgp 65000
! !
route-map default permit 10 route-map default permit 10
set metric 123 set metric 123
set as-path prepend 65000 65000 65000
! !

4
tests/topotests/bgp_default_route_route_map_set/test_bgp_default-originate_route-map_set.py
View File

@ -93,7 +93,9 @@ def test_bgp_default_originate_route_map():
def _bgp_default_route_has_metric(router): def _bgp_default_route_has_metric(router):
output = json.loads(router.vtysh_cmd("show ip bgp 0.0.0.0/0 json")) output = json.loads(router.vtysh_cmd("show ip bgp 0.0.0.0/0 json"))
expected = {"paths": [{"metric": 123}]} expected = {
"paths": [{"aspath": {"string": "65000 65000 65000 65000"}, "metric": 123}]
}
return topotest.json_cmp(output, expected) return topotest.json_cmp(output, expected)
test_func = functools.partial(_bgp_converge, router) test_func = functools.partial(_bgp_converge, router)