tests: Check received prefixes before immediately sending dynamic cap…

…abilities 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 <[email protected]>
FRRouting · Nov 9, 2023 · 5cf01b0 · 5cf01b0
1 parent cc75bdf
commit 5cf01b0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
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
@@ -68,6 +68,11 @@ def _bgp_converge():
                     "gracefulRestart": "advertisedAndReceived",
                     "longLivedGracefulRestart": "advertisedAndReceived",
                 },
+                "addressFamilyInfo": {
+                    "ipv4Unicast": {
+                        "acceptedPrefixCounter": 3,
+                    }
+                },
                 "gracefulRestartInfo": {
                     "nBit": True,
                     "timers": {
@@ -116,6 +121,11 @@ def _bgp_check_if_session_not_reset_after_changing_gr_settings():
                     "gracefulRestart": "advertisedAndReceived",
                     "longLivedGracefulRestart": "advertisedAndReceived",
                 },
+                "addressFamilyInfo": {
+                    "ipv4Unicast": {
+                        "acceptedPrefixCounter": 3,
+                    }
+                },
                 "gracefulRestartInfo": {
                     "nBit": True,
                     "timers": {

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
@@ -66,6 +66,11 @@ def _bgp_converge():
                 "neighborCapabilities": {
                     "dynamic": "advertisedAndReceived",
                 },
+                "addressFamilyInfo": {
+                    "ipv4Unicast": {
+                        "acceptedPrefixCounter": 3,
+                    }
+                },
             }
         }
         return topotest.json_cmp(output, expected)
@@ -108,6 +113,11 @@ def _bgp_check_if_session_not_reset():
                     "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
@@ -68,6 +68,11 @@ def _bgp_converge():
                         "receivedSoftwareVersion": None,
                     },
                 },
+                "addressFamilyInfo": {
+                    "ipv4Unicast": {
+                        "acceptedPrefixCounter": 3,
+                    }
+                },
             }
         }
         return topotest.json_cmp(output, expected)
@@ -129,6 +134,11 @@ def _bgp_software_version():
                         "receivedSoftwareVersion": rcv,
                     },
                 },
+                "addressFamilyInfo": {
+                    "ipv4Unicast": {
+                        "acceptedPrefixCounter": 3,
+                    }
+                },
                 "messageStats": {
                     "notificationsRecv": 0,
                     "capabilityRecv": 1,