forked from FRRouting/frr
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request FRRouting#16399 from FRRouting/mergify/bp/dev/10.1…
…/pr-16374 bgpd: Mark VRF instance as auto created if import vrf is configured for this instance (backport FRRouting#16374)
- Loading branch information
Showing
4 changed files
with
151 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| ! | ||
| vrf vrf100 | ||
| vni 10100 | ||
| exit-vrf | ||
| ! | ||
| interface r1-eth0 vrf vrf100 | ||
| ip address 192.168.1.1/24 | ||
| ! | ||
| router bgp 65000 | ||
| address-family ipv4 unicast | ||
| import vrf vrf100 | ||
| exit-address-family | ||
| ! | ||
| router bgp 65100 vrf vrf100 | ||
| address-family ipv4 unicast | ||
| redistribute connected | ||
| exit-address-family | ||
| ! |
107 changes: 107 additions & 0 deletions
107
tests/topotests/bgp_vrf_different_asn/test_bgp_vrf_different_asn.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| #!/usr/bin/env python | ||
| # SPDX-License-Identifier: ISC | ||
|
|
||
| # | ||
| # Copyright (c) 2024 by | ||
| # Donatas Abraitis <[email protected]> | ||
| # | ||
|
|
||
| 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 | ||
|
|
||
| pytestmark = [pytest.mark.bgpd] | ||
|
|
||
|
|
||
| def build_topo(tgen): | ||
| for routern in range(1, 2): | ||
| tgen.add_router("r{}".format(routern)) | ||
|
|
||
| switch = tgen.add_switch("s1") | ||
| switch.add_link(tgen.gears["r1"]) | ||
|
|
||
|
|
||
| def setup_module(mod): | ||
| tgen = Topogen(build_topo, mod.__name__) | ||
| tgen.start_topology() | ||
|
|
||
| r1 = tgen.gears["r1"] | ||
| r1.run("ip link add vrf100 type vrf table 1001") | ||
| r1.run("ip link set up dev vrf100") | ||
| r1.run("ip link set r1-eth0 master vrf100") | ||
|
|
||
| router_list = tgen.routers() | ||
|
|
||
| for _, (rname, router) in enumerate(router_list.items(), 1): | ||
| router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname))) | ||
|
|
||
| tgen.start_router() | ||
|
|
||
|
|
||
| def teardown_module(mod): | ||
| tgen = get_topogen() | ||
| tgen.stop_topology() | ||
|
|
||
|
|
||
| def test_bgp_vrf_different_asn(): | ||
| tgen = get_topogen() | ||
|
|
||
| if tgen.routers_have_failure(): | ||
| pytest.skip(tgen.errors) | ||
|
|
||
| def _bgp_check_instances(): | ||
| output = json.loads(tgen.gears["r1"].vtysh_cmd("show bgp vrf all json")) | ||
| expected = { | ||
| "default": { | ||
| "vrfName": "default", | ||
| "localAS": 65000, | ||
| }, | ||
| "vrf100": { | ||
| "vrfName": "vrf100", | ||
| "localAS": 65100, | ||
| }, | ||
| } | ||
| return topotest.json_cmp(output, expected) | ||
|
|
||
| test_func = functools.partial(_bgp_check_instances) | ||
| _, result = topotest.run_and_expect(test_func, None, count=30, wait=1) | ||
| assert result is None, "Can't see vrf100 to be under 65100 ASN" | ||
|
|
||
| def _bgp_check_imported_route(): | ||
| output = json.loads( | ||
| tgen.gears["r1"].vtysh_cmd("show ip route 192.168.1.0/24 json") | ||
| ) | ||
| expected = { | ||
| "192.168.1.0/24": [ | ||
| { | ||
| "installed": True, | ||
| "selected": True, | ||
| "nexthops": [ | ||
| { | ||
| "interfaceName": "vrf100", | ||
| "vrf": "vrf100", | ||
| "active": True, | ||
| } | ||
| ], | ||
| } | ||
| ] | ||
| } | ||
| return topotest.json_cmp(output, expected) | ||
|
|
||
| test_func = functools.partial(_bgp_check_imported_route) | ||
| _, result = topotest.run_and_expect(test_func, None, count=30, wait=1) | ||
| assert result is None, "Can't see 192.168.1.0/24 being imported into a default VRF" | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| args = ["-s"] + sys.argv[1:] | ||
| sys.exit(pytest.main(args)) |