Merge pull request #17883 from opensourcerouting/fix/topotest_dynamic_cap_enhe

tests: Fix test_bgp_dynamic_capability_enhe topotest
This commit is contained in:
Jafar Al-Gharaibeh 2025-01-20 13:31:47 -06:00 committed by GitHub
commit 4f65107d20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -114,7 +114,7 @@ def test_bgp_dynamic_capability_enhe():
# Clear message stats to check if we receive a notification or not after we
# change the role.
r1.vtysh_cmd("clear bgp 2001:db8::2 message-stats")
r2.vtysh_cmd("clear bgp 2001:db8::1 message-stats")
r1.vtysh_cmd(
"""
configure terminal
@ -149,32 +149,6 @@ def test_bgp_dynamic_capability_enhe():
_, result = topotest.run_and_expect(test_func, None, count=30, wait=1)
assert result is None, "Session was reset after setting ENHE capability"
def _bgp_check_if_session_not_reset():
output = json.loads(r2.vtysh_cmd("show bgp neighbor 2001:db8::1 json"))
expected = {
"2001:db8::1": {
"bgpState": "Established",
"neighborCapabilities": {
"dynamic": "advertisedAndReceived",
"extendedNexthop": "advertisedAndReceived",
"extendedNexthopFamililesByPeer": {
"ipv4Unicast": "recieved",
},
},
"messageStats": {
"notificationsRecv": 0,
"capabilityRecv": 1,
},
}
}
return topotest.json_cmp(output, expected)
test_func = functools.partial(
_bgp_check_if_session_not_reset,
)
_, result = topotest.run_and_expect(test_func, None, count=30, wait=1)
assert result is None, "Session was reset after setting ENHE capability"
def _bgp_check_nexthop_enhe():
output = json.loads(r1.vtysh_cmd("show ip route 10.10.10.10/32 json"))
expected = {