tests: Do not try establishing a connection from r1 to r2

If r1 becomes the "server" (= local port 179), then it initiates the connection
after sending BGP Notification (BFD Down) and r2 resets the last error code.

Telling r1 do not connect to r2, fixes the issue.

Tested with `pytest -s -n 48` at least 20 times - no failures.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/tests/topotests/bgp_bfd_down_cease_notification/r1/bgpd.conf b/tests/topotests/bgp_bfd_down_cease_notification/r1/bgpd.conf
index 2071c256dabed326037042a0cadffb0c42844c08..e855f75c20dee7643dd5055fcfe5802b1a39c429 100644 (file)
--- a/tests/topotests/bgp_bfd_down_cease_notification/r1/bgpd.conf
+++ b/tests/topotests/bgp_bfd_down_cease_notification/r1/bgpd.conf
@@ -2,7 +2,9 @@ router bgp 65001
  no bgp ebgp-requires-policy
  neighbor 192.168.255.2 remote-as external
  neighbor 192.168.255.2 timers 3 10
+ neighbor 192.168.255.2 timers connect 1
  neighbor 192.168.255.2 bfd
+ neighbor 192.168.255.2 passive
  address-family ipv4
   redistribute connected
  exit-address-family

diff --git a/tests/topotests/bgp_bfd_down_cease_notification/r2/bgpd.conf b/tests/topotests/bgp_bfd_down_cease_notification/r2/bgpd.conf
index 3279804e6ec5e9f7a9189fb9ac610b66a321afc8..faf2c6b39bbf6d3f3631d8bf76af9466d0bf4748 100644 (file)
--- a/tests/topotests/bgp_bfd_down_cease_notification/r2/bgpd.conf
+++ b/tests/topotests/bgp_bfd_down_cease_notification/r2/bgpd.conf
@@ -2,6 +2,7 @@ router bgp 65002
  no bgp ebgp-requires-policy
  neighbor 192.168.255.1 remote-as external
  neighbor 192.168.255.1 timers 3 10
+ neighbor 192.168.255.1 timers connect 1
  neighbor 192.168.255.1 bfd
  address-family ipv4
   redistribute connected

diff --git a/tests/topotests/bgp_bfd_down_cease_notification/test_bgp_bfd_down_cease_notification.py b/tests/topotests/bgp_bfd_down_cease_notification/test_bgp_bfd_down_cease_notification.py
index 0bc0306d7db75ee3e285eb59f691cf5fc83e36dc..00142981c502e1b31543e7a79e52cd47571d15b4 100644 (file)
--- a/tests/topotests/bgp_bfd_down_cease_notification/test_bgp_bfd_down_cease_notification.py
+++ b/tests/topotests/bgp_bfd_down_cease_notification/test_bgp_bfd_down_cease_notification.py
@@ -88,13 +88,14 @@ def test_bgp_bfd_down_notification():
         expected = {
             "192.168.255.1": {
                 "lastNotificationReason": "Cease/BFD Down",
+                "lastNotificationHardReset": True,
             }
         }
         return topotest.json_cmp(output, expected)
 
     step("Initial BGP converge")
     test_func = functools.partial(_bgp_converge)
-    _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
+    _, result = topotest.run_and_expect(test_func, None, count=60, wait=1)
     assert result is None, "Failed to see BGP convergence on R2"
 
     step("Kill bfdd on R2")
@@ -102,7 +103,7 @@ def test_bgp_bfd_down_notification():
 
     step("Check if we received Cease/BFD Down notification message")
     test_func = functools.partial(_bgp_bfd_down_notification)
-    _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
+    _, result = topotest.run_and_expect(test_func, None, count=60, wait=1)
     assert result is None, "Failed to see BGP Cease/BFD Down notification message on R2"