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

Merge pull request #12462 from opensourcerouting/fix/default_originate_labeled_unicast

Browse Source 
bgpd: Labeled unicast with default-originate
This commit is contained in:
Donald Sharp 2022-12-09 19:44:58 -05:00 committed by GitHub
commit e3f5a669e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 191 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bgpd/bgp_updgrp_adv.c
View File

@ -655,6 +655,7 @@ void subgroup_announce_table(struct update_subgroup *subgrp,
struct peer *peer;
afi_t afi;
safi_t safi;
safi_t safi_rib;
bool addpath_capable;
struct bgp *bgp;
bool advertise;
@ -666,10 +667,12 @@ void subgroup_announce_table(struct update_subgroup *subgrp,
addpath_capable = bgp_addpath_encode_tx(peer, afi, safi);
if (safi == SAFI_LABELED_UNICAST)
safi = SAFI_UNICAST;
safi_rib = SAFI_UNICAST;
else
safi_rib = safi;
if (!table)
table = peer->bgp->rib[afi][safi];
table = peer->bgp->rib[afi][safi_rib];
if (safi != SAFI_MPLS_VPN && safi != SAFI_ENCAP && safi != SAFI_EVPN
&& CHECK_FLAG(peer->af_flags[afi][safi],
@ -688,7 +691,7 @@ void subgroup_announce_table(struct update_subgroup *subgrp,
for (ri = bgp_dest_get_bgp_path_info(dest); ri; ri = ri->next) {
if (!bgp_check_selected(ri, peer, addpath_capable, afi,
safi))
safi_rib))
continue;
if (subgroup_announce_check(dest, ri, subgrp, dest_p,
@ -703,7 +706,8 @@ void subgroup_announce_table(struct update_subgroup *subgrp,
bgp_adj_out_unset_subgroup(
dest, subgrp, 1,
bgp_addpath_id_for_peer(
peer, afi, safi,
peer, afi,
safi_rib,
&ri->tx_addpath));
}
} else {
@ -722,7 +726,7 @@ void subgroup_announce_table(struct update_subgroup *subgrp,
bgp_adj_out_unset_subgroup(
dest, subgrp, 1,
bgp_addpath_id_for_peer(
peer, afi, safi,
peer, afi, safi_rib,
&ri->tx_addpath));
}
}
@ -799,6 +803,7 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
route_map_result_t new_ret = RMAP_DENYMATCH;
afi_t afi;
safi_t safi;
safi_t safi_rib;
int pref = 65536;
int new_pref = 0;
@ -812,6 +817,11 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
if (!(afi == AFI_IP || afi == AFI_IP6))
return;
if (safi == SAFI_LABELED_UNICAST)
safi_rib = SAFI_UNICAST;
else
safi_rib = safi;
bgp = peer->bgp;
from = bgp->peer_self;
@ -845,7 +855,7 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
* the default route. We announce the default
* route only if route-map has a match.
*/
for (dest = bgp_table_top(bgp->rib[afi][safi]); dest;
for (dest = bgp_table_top(bgp->rib[afi][safi_rib]); dest;
dest = bgp_route_next(dest)) {
if (!bgp_dest_has_bgp_path_info_data(dest))
continue;
@ -903,7 +913,8 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
memset(&p, 0, sizeof(p));
p.family = afi2family(afi);
p.prefixlen = 0;
dest = bgp_afi_node_lookup(bgp->rib[afi][safi], afi, safi, &p, NULL);
dest = bgp_afi_node_lookup(bgp->rib[afi][safi_rib], afi, safi_rib, &p,
NULL);
if (withdraw) {
/* Withdraw the default route advertised using default

14
bgpd/bgp_updgrp_packet.c
View File

@ -1072,6 +1072,9 @@ void subgroup_default_update_packet(struct update_subgroup *subgrp,
safi_t safi;
struct bpacket_attr_vec_arr vecarr;
bool addpath_capable = false;
uint8_t default_originate_label[4] = {0x80, 0x00, 0x00};
mpls_label_t *label = NULL;
uint32_t num_labels = 0;
if (DISABLE_BGP_ANNOUNCE)
return;
@ -1085,6 +1088,11 @@ void subgroup_default_update_packet(struct update_subgroup *subgrp,
bpacket_attr_vec_arr_reset(&vecarr);
addpath_capable = bgp_addpath_encode_tx(peer, afi, safi);
if (safi == SAFI_LABELED_UNICAST) {
label = (mpls_label_t *)default_originate_label;
num_labels = 1;
}
memset(&p, 0, sizeof(p));
p.family = afi2family(afi);
p.prefixlen = 0;
@ -1127,9 +1135,9 @@ void subgroup_default_update_packet(struct update_subgroup *subgrp,
pos = stream_get_endp(s);
stream_putw(s, 0);
total_attr_len = bgp_packet_attribute(
NULL, peer, s, attr, &vecarr, &p, afi, safi, from, NULL, NULL,
0, addpath_capable, BGP_ADDPATH_TX_ID_FOR_DEFAULT_ORIGINATE,
NULL);
NULL, peer, s, attr, &vecarr, &p, afi, safi, from, NULL, label,
num_labels, addpath_capable,
BGP_ADDPATH_TX_ID_FOR_DEFAULT_ORIGINATE, NULL);
/* Set Total Path Attribute Length. */
stream_putw_at(s, pos, total_attr_len);

0
tests/topotests/bgp_labeled_unicast_default_originate/__init__.py Normal file
View File

21
tests/topotests/bgp_labeled_unicast_default_originate/r1/bgpd.conf Normal file
View File

@ -0,0 +1,21 @@
!
router bgp 65001
no bgp default ipv4-unicast
no bgp ebgp-requires-policy
neighbor 192.168.12.2 remote-as external
neighbor 192.168.12.2 timers 1 3
neighbor 192.168.12.2 timers connect 1
address-family ipv4 unicast
redistribute connected
exit-address-family
address-family ipv4 labeled-unicast
neighbor 192.168.12.2 activate
neighbor 192.168.12.2 default-originate route-map r2
exit-address-family
!
!
route-map r2 permit 10
set community 65001:65001
set metric 666
exit
!

4
tests/topotests/bgp_labeled_unicast_default_originate/r1/zebra.conf Normal file
View File

@ -0,0 +1,4 @@
!
interface r1-eth0
ip address 192.168.12.1/24
!

11
tests/topotests/bgp_labeled_unicast_default_originate/r2/bgpd.conf Normal file
View File

@ -0,0 +1,11 @@
!
router bgp 65002
no bgp ebgp-requires-policy
no bgp default ipv4-unicast
neighbor 192.168.12.1 remote-as external
neighbor 192.168.12.1 timers 1 3
neighbor 192.168.12.1 timers connect 1
address-family ipv4 labeled-unicast
neighbor 192.168.12.1 activate
exit-address-family
!

4
tests/topotests/bgp_labeled_unicast_default_originate/r2/zebra.conf Normal file
View File

@ -0,0 +1,4 @@
!
interface r2-eth0
ip address 192.168.12.2/24
!

122
tests/topotests/bgp_labeled_unicast_default_originate/test_bgp_labeled_unicast_default_originate.py Normal file
View File

@ -0,0 +1,122 @@
#!/usr/bin/env python
#
# Copyright (c) 2022 by
# Donatas Abraitis <donatas@opensourcerouting.org>
#
# Permission to use, copy, modify, and/or distribute this software
# for any purpose with or without fee is hereby granted, provided
# that the above copyright notice and this permission notice appear
# in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND NETDEF DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NETDEF BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
# DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
# OF THIS SOFTWARE.
#
"""
Check if labeled-unicast works correctly with default-originate.
"""
import os
import sys
import json
import pytest
import functools
CWD = os.path.dirname(os.path.realpath(__file__))
sys.path.append(os.path.join(CWD, "../"))
# pylint: disable=C0413
from lib import topotest
from lib.topogen import Topogen, TopoRouter, get_topogen
from lib.common_config import step
pytestmark = [pytest.mark.bgpd]
def build_topo(tgen):
for routern in range(1, 3):
tgen.add_router("r{}".format(routern))
switch = tgen.add_switch("s1")
switch.add_link(tgen.gears["r1"])
switch.add_link(tgen.gears["r2"])
def setup_module(mod):
tgen = Topogen(build_topo, mod.__name__)
tgen.start_topology()
router_list = tgen.routers()
for i, (rname, router) in enumerate(router_list.items(), 1):
router.load_config(
TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname))
)
router.load_config(
TopoRouter.RD_BGP, os.path.join(CWD, "{}/bgpd.conf".format(rname))
)
tgen.start_router()
def teardown_module(mod):
tgen = get_topogen()
tgen.stop_topology()
def test_bgp_labeled_unicast_default_originate():
tgen = get_topogen()
if tgen.routers_have_failure():
pytest.skip(tgen.errors)
r1 = tgen.gears["r1"]
r2 = tgen.gears["r2"]
def _bgp_check_advertised_routes():
output = json.loads(
r1.vtysh_cmd(
"show bgp ipv4 labeled-unicast neighbors 192.168.12.2 advertised-routes json"
)
)
expected = {
"bgpOriginatingDefaultNetwork": "0.0.0.0/0",
}
return topotest.json_cmp(output, expected)
test_func = functools.partial(_bgp_check_advertised_routes)
_, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
assert result is None, "Failed to advertise default route for labeled-unicast"
def _bgp_check_received_routes():
output = json.loads(
r2.vtysh_cmd("show bgp ipv4 labeled-unicast 0.0.0.0/0 json")
)
expected = {
"paths": [
{
"valid": True,
"metric": 666,
"community": {
"string": "65001:65001",
},
}
]
}
return topotest.json_cmp(output, expected)
test_func = functools.partial(_bgp_check_received_routes)
_, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
assert result is None, "Failed to receive default route for labeled-unicast"
if __name__ == "__main__":
args = ["-s"] + sys.argv[1:]
sys.exit(pytest.main(args))