From c12b976c0afa85babc5d8ab3af6310e58214d22a Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Wed, 8 Nov 2023 16:36:07 +0200 Subject: [PATCH] tests: Check received prefixes before immediately sending dynamic capabilities If we send capabilities immediately, before receiving an UPDATE message, we end up with a notification received from the neighbor. Let's wait until we have the fully converged topology and do the stuff. Tested locally and can't replicate the failure, let's see how happy is the CI this time. Signed-off-by: Donatas Abraitis --- .../test_bgp_dynamic_capability_addpath.py | 10 ++++++++++ .../test_bgp_dynamic_capability_graceful_restart.py | 10 ++++++++++ .../test_bgp_dynamic_capability_orf.py | 6 ++++++ .../test_bgp_dynamic_capability_role.py | 10 ++++++++++ .../test_bgp_dynamic_capability_software_version.py | 10 ++++++++++ 5 files changed, 46 insertions(+) diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_addpath.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_addpath.py index 6bf0078daa..f83ee2971c 100644 --- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_addpath.py +++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_addpath.py @@ -70,6 +70,11 @@ def test_bgp_dynamic_capability_addpath(): } }, }, + "addressFamilyInfo": { + "ipv4Unicast": { + "acceptedPrefixCounter": 3, + } + }, } } return topotest.json_cmp(output, expected) @@ -108,6 +113,11 @@ def test_bgp_dynamic_capability_addpath(): } }, }, + "addressFamilyInfo": { + "ipv4Unicast": { + "acceptedPrefixCounter": 3, + } + }, "messageStats": { "notificationsRecv": 0, "capabilityRecv": 1, diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py index db1eb2723b..b7e2090eee 100644 --- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py +++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py @@ -68,6 +68,11 @@ def test_bgp_dynamic_capability_graceful_restart(): "gracefulRestart": "advertisedAndReceived", "longLivedGracefulRestart": "advertisedAndReceived", }, + "addressFamilyInfo": { + "ipv4Unicast": { + "acceptedPrefixCounter": 3, + } + }, "gracefulRestartInfo": { "nBit": True, "timers": { @@ -116,6 +121,11 @@ def test_bgp_dynamic_capability_graceful_restart(): "gracefulRestart": "advertisedAndReceived", "longLivedGracefulRestart": "advertisedAndReceived", }, + "addressFamilyInfo": { + "ipv4Unicast": { + "acceptedPrefixCounter": 3, + } + }, "gracefulRestartInfo": { "nBit": True, "timers": { diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_orf.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_orf.py index 49c7e554eb..f1ad74c05c 100644 --- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_orf.py +++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_orf.py @@ -64,6 +64,11 @@ def test_bgp_dynamic_capability_orf(): "neighborCapabilities": { "dynamic": "advertisedAndReceived", }, + "addressFamilyInfo": { + "ipv4Unicast": { + "acceptedPrefixCounter": 3, + } + }, } } return topotest.json_cmp(output, expected) @@ -116,6 +121,7 @@ def test_bgp_dynamic_capability_orf(): }, "addressFamilyInfo": { "ipv4Unicast": { + "acceptedPrefixCounter": 1, "afDependentCap": { "orfPrefixList": { "sendMode": "advertisedAndReceived", diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py index da45110e39..700d4c130d 100644 --- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py +++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py @@ -66,6 +66,11 @@ def test_bgp_dynamic_capability_role(): "neighborCapabilities": { "dynamic": "advertisedAndReceived", }, + "addressFamilyInfo": { + "ipv4Unicast": { + "acceptedPrefixCounter": 3, + } + }, } } return topotest.json_cmp(output, expected) @@ -108,6 +113,11 @@ def test_bgp_dynamic_capability_role(): "dynamic": "advertisedAndReceived", "role": "advertisedAndReceived", }, + "addressFamilyInfo": { + "ipv4Unicast": { + "acceptedPrefixCounter": 3, + } + }, "messageStats": { "notificationsRecv": 0, "capabilityRecv": 1, diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py index a653da4655..11840b4c61 100644 --- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py +++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py @@ -68,6 +68,11 @@ def test_bgp_dynamic_capability_software_version(): "receivedSoftwareVersion": None, }, }, + "addressFamilyInfo": { + "ipv4Unicast": { + "acceptedPrefixCounter": 3, + } + }, } } return topotest.json_cmp(output, expected) @@ -129,6 +134,11 @@ def test_bgp_dynamic_capability_software_version(): "receivedSoftwareVersion": rcv, }, }, + "addressFamilyInfo": { + "ipv4Unicast": { + "acceptedPrefixCounter": 3, + } + }, "messageStats": { "notificationsRecv": 0, "capabilityRecv": 1,