mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-04-29 18:10:23 +00:00
Merge pull request #13024 from opensourcerouting/fix/bgpd_prefix-list_changes_not_affected
lib: Adjust only any flag for prefix-list entries if destroying
This commit is contained in:
commit
32894bf8af
@ -1323,6 +1323,7 @@ DEFPY_YANG(
|
|||||||
vty, "./ipv4-prefix-length-lesser-or-equal",
|
vty, "./ipv4-prefix-length-lesser-or-equal",
|
||||||
NB_OP_DESTROY, NULL);
|
NB_OP_DESTROY, NULL);
|
||||||
}
|
}
|
||||||
|
nb_cli_enqueue_change(vty, "./any", NB_OP_DESTROY, NULL);
|
||||||
} else {
|
} else {
|
||||||
nb_cli_enqueue_change(vty, "./any", NB_OP_CREATE, NULL);
|
nb_cli_enqueue_change(vty, "./any", NB_OP_CREATE, NULL);
|
||||||
}
|
}
|
||||||
|
@ -1565,7 +1565,7 @@ static int lib_prefix_list_entry_any_destroy(struct nb_cb_destroy_args *args)
|
|||||||
/* Start prefix entry update procedure. */
|
/* Start prefix entry update procedure. */
|
||||||
prefix_list_entry_update_start(ple);
|
prefix_list_entry_update_start(ple);
|
||||||
|
|
||||||
prefix_list_entry_set_empty(ple);
|
ple->any = false;
|
||||||
|
|
||||||
/* Finish prefix entry update procedure. */
|
/* Finish prefix entry update procedure. */
|
||||||
prefix_list_entry_update_finish(ple);
|
prefix_list_entry_update_finish(ple);
|
||||||
|
0
tests/topotests/bgp_prefix_list_any/__init__.py
Normal file
0
tests/topotests/bgp_prefix_list_any/__init__.py
Normal file
9
tests/topotests/bgp_prefix_list_any/r1/bgpd.conf
Normal file
9
tests/topotests/bgp_prefix_list_any/r1/bgpd.conf
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
!
|
||||||
|
router bgp 65001
|
||||||
|
no bgp ebgp-requires-policy
|
||||||
|
no bgp network import-check
|
||||||
|
neighbor 192.168.1.2 remote-as external
|
||||||
|
address-family ipv4 unicast
|
||||||
|
network 192.168.0.1/32
|
||||||
|
exit-address-family
|
||||||
|
!
|
4
tests/topotests/bgp_prefix_list_any/r1/zebra.conf
Normal file
4
tests/topotests/bgp_prefix_list_any/r1/zebra.conf
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
!
|
||||||
|
int r1-eth0
|
||||||
|
ip address 192.168.1.1/24
|
||||||
|
!
|
28
tests/topotests/bgp_prefix_list_any/r2/bgpd.conf
Normal file
28
tests/topotests/bgp_prefix_list_any/r2/bgpd.conf
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
!
|
||||||
|
debug bgp updates
|
||||||
|
!
|
||||||
|
router bgp 65002
|
||||||
|
no bgp ebgp-requires-policy
|
||||||
|
no bgp network import-check
|
||||||
|
neighbor 192.168.1.1 remote-as external
|
||||||
|
address-family ipv4 unicast
|
||||||
|
network 10.10.10.1/32
|
||||||
|
network 10.10.10.2/32
|
||||||
|
network 10.10.10.3/32
|
||||||
|
network 10.10.10.10/32
|
||||||
|
neighbor 192.168.1.1 route-map r1 out
|
||||||
|
exit-address-family
|
||||||
|
!
|
||||||
|
ip prefix-list r1-1 seq 5 permit 10.10.10.1/32
|
||||||
|
ip prefix-list r1-1 seq 10 permit 10.10.10.2/32
|
||||||
|
ip prefix-list r1-1 seq 15 permit 10.10.10.3/32
|
||||||
|
ip prefix-list r1-2 seq 5 permit 10.10.10.10/32
|
||||||
|
!ip prefix-list r1-2 seq 5 deny any
|
||||||
|
!
|
||||||
|
route-map r1 permit 10
|
||||||
|
match ip address prefix-list r1-1
|
||||||
|
exit
|
||||||
|
!
|
||||||
|
route-map r1 permit 20
|
||||||
|
match ip address prefix-list r1-2
|
||||||
|
exit
|
4
tests/topotests/bgp_prefix_list_any/r2/zebra.conf
Normal file
4
tests/topotests/bgp_prefix_list_any/r2/zebra.conf
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
!
|
||||||
|
int r2-eth0
|
||||||
|
ip address 192.168.1.2/24
|
||||||
|
!
|
@ -0,0 +1,96 @@
|
|||||||
|
#!/usr/bin/env python
|
||||||
|
# SPDX-License-Identifier: ISC
|
||||||
|
|
||||||
|
# Copyright (c) 2023 by
|
||||||
|
# Donatas Abraitis <donatas@opensourcerouting.org>
|
||||||
|
#
|
||||||
|
|
||||||
|
"""
|
||||||
|
Test if route-map works correctly when modifying prefix-list
|
||||||
|
from deny to permit with any, and vice-versa.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import json
|
||||||
|
import pytest
|
||||||
|
import functools
|
||||||
|
|
||||||
|
pytestmark = pytest.mark.bgpd
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
pytestmark = [pytest.mark.bgpd]
|
||||||
|
|
||||||
|
|
||||||
|
def setup_module(mod):
|
||||||
|
topodef = {"s1": ("r1", "r2")}
|
||||||
|
tgen = Topogen(topodef, 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_route_map_prefix_list():
|
||||||
|
tgen = get_topogen()
|
||||||
|
|
||||||
|
if tgen.routers_have_failure():
|
||||||
|
pytest.skip(tgen.errors)
|
||||||
|
|
||||||
|
r2 = tgen.gears["r2"]
|
||||||
|
|
||||||
|
def _bgp_prefixes_sent(count):
|
||||||
|
output = json.loads(r2.vtysh_cmd("show bgp ipv4 unicast summary json"))
|
||||||
|
expected = {"peers": {"192.168.1.1": {"pfxSnt": count, "state": "Established"}}}
|
||||||
|
return topotest.json_cmp(output, expected)
|
||||||
|
|
||||||
|
test_func = functools.partial(_bgp_prefixes_sent, 4)
|
||||||
|
_, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
|
||||||
|
assert result is None, "Can't converge initial topology"
|
||||||
|
|
||||||
|
r2.vtysh_cmd(
|
||||||
|
"""
|
||||||
|
configure terminal
|
||||||
|
ip prefix-list r1-2 seq 5 deny any
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
|
test_func = functools.partial(_bgp_prefixes_sent, 3)
|
||||||
|
_, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
|
||||||
|
assert result is None, "Only 3 prefixes MUST be advertised, seeing more"
|
||||||
|
|
||||||
|
r2.vtysh_cmd(
|
||||||
|
"""
|
||||||
|
configure terminal
|
||||||
|
ip prefix-list r1-2 seq 5 permit 10.10.10.10/32
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
|
test_func = functools.partial(_bgp_prefixes_sent, 4)
|
||||||
|
_, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
|
||||||
|
assert result is None, "More or less prefixes advertised to r1, MUST be 4"
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
args = ["-s"] + sys.argv[1:]
|
||||||
|
sys.exit(pytest.main(args))
|
Loading…
Reference in New Issue
Block a user