proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-06 05:47:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17147 from FRRouting/mergify/bp/stable/10.1/pr-17091

Browse Source 
bgpd: fix several issues in sourcing AIGP attribute (backport #17091)
This commit is contained in:
Jafar Al-Gharaibeh 2024-10-17 11:29:40 -05:00 committed by GitHub
commit 16c17f55d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_attr.h
View File

@ -595,8 +595,6 @@ static inline uint64_t bgp_attr_get_aigp_metric(const struct attr *attr)
static inline void bgp_attr_set_aigp_metric(struct attr *attr, uint64_t aigp) static inline void bgp_attr_set_aigp_metric(struct attr *attr, uint64_t aigp)
{ {
attr->aigp_metric = aigp; attr->aigp_metric = aigp;
if (aigp)
SET_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_AIGP)); SET_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_AIGP));
} }

10
bgpd/bgp_route.c
View File

@ -6698,9 +6698,6 @@ void bgp_static_update(struct bgp *bgp, const struct prefix *p,
if (afi == AFI_IP) if (afi == AFI_IP)
attr.mp_nexthop_len = BGP_ATTR_NHLEN_IPV4; attr.mp_nexthop_len = BGP_ATTR_NHLEN_IPV4;
if (bgp_static->igpmetric)
bgp_attr_set_aigp_metric(&attr, bgp_static->igpmetric);
if (bgp_static->atomic) if (bgp_static->atomic)
attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_ATOMIC_AGGREGATE); attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_ATOMIC_AGGREGATE);
@ -8955,9 +8952,6 @@ void bgp_redistribute_add(struct bgp *bgp, struct prefix *p,
attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_MULTI_EXIT_DISC); attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_MULTI_EXIT_DISC);
attr.tag = tag; attr.tag = tag;
if (metric)
bgp_attr_set_aigp_metric(&attr, metric);
afi = family2afi(p->family); afi = family2afi(p->family);
red = bgp_redist_lookup(bgp, afi, type, instance); red = bgp_redist_lookup(bgp, afi, type, instance);
@ -8967,10 +8961,8 @@ void bgp_redistribute_add(struct bgp *bgp, struct prefix *p,
/* Copy attribute for modification. */ /* Copy attribute for modification. */
attr_new = attr; attr_new = attr;
if (red->redist_metric_flag) { if (red->redist_metric_flag)
attr_new.med = red->redist_metric; attr_new.med = red->redist_metric;
bgp_attr_set_aigp_metric(&attr_new, red->redist_metric);
}
/* Apply route-map. */ /* Apply route-map. */
if (red->rmap.name) { if (red->rmap.name) {

16
bgpd/bgp_routemap.c
View File

@ -3451,19 +3451,15 @@ route_set_aigp_metric(void *rule, const struct prefix *pfx, void *object)
{ {
const char *aigp_metric = rule; const char *aigp_metric = rule;
struct bgp_path_info *path = object; struct bgp_path_info *path = object;
uint32_t aigp = 0; uint32_t aigp;
if (strmatch(aigp_metric, "igp-metric")) { /* Note: the metric is stored as MED for a locally redistributed. */
if (!path->nexthop) if (strmatch(aigp_metric, "igp-metric"))
return RMAP_NOMATCH; aigp = path->nexthop ? path->nexthop->metric : path->attr->med;
else
bgp_attr_set_aigp_metric(path->attr, path->nexthop->metric);
} else {
aigp = atoi(aigp_metric); aigp = atoi(aigp_metric);
bgp_attr_set_aigp_metric(path->attr, aigp);
}
path->attr->flag |= ATTR_FLAG_BIT(BGP_ATTR_AIGP); bgp_attr_set_aigp_metric(path->attr, aigp);
return RMAP_OKAY; return RMAP_OKAY;
} }

7
tests/topotests/bgp_aigp/r4/bgpd.conf
View File

@ -13,9 +13,16 @@ router bgp 65001
neighbor 10.0.0.6 update-source lo neighbor 10.0.0.6 update-source lo
address-family ipv4 address-family ipv4
redistribute connected route-map connected-to-bgp redistribute connected route-map connected-to-bgp
redistribute ospf route-map ospf-to-bgp
neighbor 192.168.24.2 route-map set-nexthop out neighbor 192.168.24.2 route-map set-nexthop out
exit-address-family exit-address-family
! !
ip prefix-list p66 seq 5 permit 10.0.6.6/32
!
route-map ospf-to-bgp permit 10
match ip address prefix-list p66
set aigp igp-metric
!
! Two OSPF domains should be isolated - otherwise the connected routes ! Two OSPF domains should be isolated - otherwise the connected routes
! on r4 would be advertised to r3 (via r4 -> r6 -> r5 -> r3), and can ! on r4 would be advertised to r3 (via r4 -> r6 -> r5 -> r3), and can
! mess up bgp bestpath calculation (igp metrics for the BGP nexthops). ! mess up bgp bestpath calculation (igp metrics for the BGP nexthops).

1
tests/topotests/bgp_aigp/r6/zebra.conf
View File

@ -1,6 +1,7 @@
! !
interface lo interface lo
ip address 10.0.0.6/32 ip address 10.0.0.6/32
ip address 10.0.6.6/32
! !
interface r6-eth0 interface r6-eth0
ip address 192.168.46.6/24 ip address 192.168.46.6/24

5
tests/topotests/bgp_aigp/test_bgp_aigp.py
View File

@ -228,6 +228,11 @@ def test_bgp_aigp():
""" """
) )
# r4, 10.0.6.6/32 with aigp-metric 20
test_func = functools.partial(_bgp_check_aigp_metric, r4, "10.0.6.6/32", 20)
_, result = topotest.run_and_expect(test_func, None, count=60, wait=1)
assert result is None, "aigp-metric for 10.0.6.6/32 is not 20"
# r4, 10.0.0.71/32 with aigp-metric 71 # r4, 10.0.0.71/32 with aigp-metric 71
test_func = functools.partial(_bgp_check_aigp_metric, r4, "10.0.0.71/32", 71) test_func = functools.partial(_bgp_check_aigp_metric, r4, "10.0.0.71/32", 71)
_, result = topotest.run_and_expect(test_func, None, count=60, wait=1) _, result = topotest.run_and_expect(test_func, None, count=60, wait=1)