diff --git a/bgpd/bgp_clist.c b/bgpd/bgp_clist.c index 34d4be8c93..bc6d4e144e 100644 --- a/bgpd/bgp_clist.c +++ b/bgpd/bgp_clist.c @@ -674,9 +674,6 @@ bool community_list_match(struct community *com, struct community_list *list) return entry->direct == COMMUNITY_PERMIT; if (entry->style == COMMUNITY_LIST_STANDARD) { - if (community_include(entry->u.com, COMMUNITY_INTERNET)) - return entry->direct == COMMUNITY_PERMIT; - if (community_match(com, entry->u.com)) return entry->direct == COMMUNITY_PERMIT; } else if (entry->style == COMMUNITY_LIST_EXPANDED) { diff --git a/tests/topotests/bgp_clist/__init__.py b/tests/topotests/bgp_clist/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/topotests/bgp_clist/r1/bgpd.conf b/tests/topotests/bgp_clist/r1/bgpd.conf new file mode 100644 index 0000000000..68c5222e92 --- /dev/null +++ b/tests/topotests/bgp_clist/r1/bgpd.conf @@ -0,0 +1,28 @@ +router bgp 65001 + no bgp ebgp-requires-policy + neighbor 192.168.255.2 remote-as 65002 + neighbor 192.168.255.2 timers 3 10 + address-family ipv4 + redistribute connected route-map connected + neighbor 192.168.255.2 route-map r2 out + exit-address-family +! +ip prefix-list p1 seq 5 permit 172.16.255.253/32 +ip prefix-list p2 seq 5 permit 172.16.255.254/32 +! +bgp community-list standard OUT_AS_PERMIT seq 5 permit internet +bgp community-list standard OUT_AS_PERMIT seq 10 deny 4:1 +bgp community-list standard OUT_AS_PERMIT seq 20 permit 3:1 +! +route-map r2 permit 10 + match community OUT_AS_PERMIT + set community 123:123 additive +exit +! +route-map connected permit 10 + match ip address prefix-list p1 + set community 3:1 +route-map connected permit 20 + match ip address prefix-list p2 + set community 4:1 +exit diff --git a/tests/topotests/bgp_clist/r1/zebra.conf b/tests/topotests/bgp_clist/r1/zebra.conf new file mode 100644 index 0000000000..ae668d79ed --- /dev/null +++ b/tests/topotests/bgp_clist/r1/zebra.conf @@ -0,0 +1,10 @@ +! +interface lo + ip address 172.16.255.253/32 + ip address 172.16.255.254/32 +! +interface r1-eth0 + ip address 192.168.255.1/24 +! +ip forwarding +! diff --git a/tests/topotests/bgp_clist/r2/bgpd.conf b/tests/topotests/bgp_clist/r2/bgpd.conf new file mode 100644 index 0000000000..cdc0d217be --- /dev/null +++ b/tests/topotests/bgp_clist/r2/bgpd.conf @@ -0,0 +1,5 @@ +router bgp 65002 + no bgp ebgp-requires-policy + neighbor 192.168.255.1 remote-as 65001 + neighbor 192.168.255.1 timers 3 10 +! diff --git a/tests/topotests/bgp_clist/r2/zebra.conf b/tests/topotests/bgp_clist/r2/zebra.conf new file mode 100644 index 0000000000..606c17bec9 --- /dev/null +++ b/tests/topotests/bgp_clist/r2/zebra.conf @@ -0,0 +1,6 @@ +! +interface r2-eth0 + ip address 192.168.255.2/24 +! +ip forwarding +! diff --git a/tests/topotests/bgp_clist/test_bgp_clist.py b/tests/topotests/bgp_clist/test_bgp_clist.py new file mode 100644 index 0000000000..93825f441b --- /dev/null +++ b/tests/topotests/bgp_clist/test_bgp_clist.py @@ -0,0 +1,114 @@ +#!/usr/bin/env python + +# +# Copyright (c) 2022 by +# Donatas Abraitis +# +# 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. +# + +""" +Test if basic BGP community-list filtering works correctly. +""" + +import os +import sys +import json +import pytest +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 + +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_clist(): + tgen = get_topogen() + + router = tgen.gears["r2"] + + if tgen.routers_have_failure(): + pytest.skip(tgen.errors) + + def _bgp_converge(): + output = json.loads(router.vtysh_cmd("show bgp summary json")) + expected = { + "ipv4Unicast": { + "peers": {"192.168.255.1": {"state": "Established", "pfxRcd": 1}} + } + } + return topotest.json_cmp(output, expected) + + test_func = functools.partial(_bgp_converge) + _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5) + assert result is None, "BGP can't converge" + + def _bgp_clist_match(): + output = json.loads(router.vtysh_cmd("show bgp ipv4 unicast json detail")) + expected = { + "routes": { + "172.16.255.253/32": [ + {"valid": True, "community": {"string": "3:1 123:123"}} + ], + "172.16.255.254/32": None, + } + } + return topotest.json_cmp(output, expected) + + test_func = functools.partial(_bgp_clist_match) + _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5) + assert result is None, "BGP community-list filtering doesn't work" + + +if __name__ == "__main__": + args = ["-s"] + sys.argv[1:] + sys.exit(pytest.main(args))