diff options
| author | Russ White <russ@riw.us> | 2024-09-24 16:13:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-24 16:13:14 +0200 |
| commit | 74aef8aabdc1ebe560e1d6ee55f11e6507223997 (patch) | |
| tree | 349b69b2b4093bff373236765a54cb93a853fd79 /tests/topotests | |
| parent | Merge pull request #16853 from Shbinging/no_ip_ospf_dead_interval_minimal (diff) | |
| parent | tests: Simplify BGP dual-as topotest (diff) | |
| download | frr-74aef8aabdc1ebe560e1d6ee55f11e6507223997.tar.xz frr-74aef8aabdc1ebe560e1d6ee55f11e6507223997.zip | |
Merge pull request #16895 from opensourcerouting/fix/dual_as_topotest
tests: Simplify BGP dual-as topotest
Diffstat (limited to 'tests/topotests')
| -rw-r--r-- | tests/topotests/bgp_dual_as/r2/frr.conf | 2 | ||||
| -rw-r--r-- | tests/topotests/bgp_dual_as/test_bgp_dual_as.py | 32 |
2 files changed, 1 insertions, 33 deletions
diff --git a/tests/topotests/bgp_dual_as/r2/frr.conf b/tests/topotests/bgp_dual_as/r2/frr.conf index cf5731b60..a901d49a5 100644 --- a/tests/topotests/bgp_dual_as/r2/frr.conf +++ b/tests/topotests/bgp_dual_as/r2/frr.conf @@ -4,7 +4,7 @@ interface r2-eth0 ! router bgp 65002 no bgp ebgp-requires-policy - neighbor 10.0.0.1 remote-as 65001 + neighbor 10.0.0.1 remote-as 65000 neighbor 10.0.0.1 timers 3 10 neighbor 10.0.0.1 timers connect 1 ! diff --git a/tests/topotests/bgp_dual_as/test_bgp_dual_as.py b/tests/topotests/bgp_dual_as/test_bgp_dual_as.py index fcac9c94e..b202d7819 100644 --- a/tests/topotests/bgp_dual_as/test_bgp_dual_as.py +++ b/tests/topotests/bgp_dual_as/test_bgp_dual_as.py @@ -54,38 +54,6 @@ def test_bgp_dual_as(): pytest.skip(tgen.errors) r1 = tgen.gears["r1"] - r2 = tgen.gears["r2"] - - def _bgp_converge_65001(): - output = json.loads(r1.vtysh_cmd("show bgp ipv4 summary json")) - expected = { - "ipv4Unicast": { - "as": 65000, - "peers": { - "10.0.0.2": { - "hostname": "r2", - "remoteAs": 65002, - "localAs": 65001, - "state": "Established", - "peerState": "OK", - } - }, - } - } - return topotest.json_cmp(output, expected) - - test_func = functools.partial(_bgp_converge_65001) - _, result = topotest.run_and_expect(test_func, None, count=30, wait=1) - assert result is None, "Can't establish BGP session using local-as AS 65001" - - step("Change remote-as from r2 to use global AS 65000") - r2.vtysh_cmd( - """ - configure terminal - router bgp - neighbor 10.0.0.1 remote-as 65000 - """ - ) def _bgp_converge_65000(): output = json.loads(r1.vtysh_cmd("show bgp ipv4 summary json")) |