]> git.puffer.fish Git - mirror/frr.git/commitdiff
tests: bgp_srv6l3vpn_to_bgp_vrf3 needs more time 17828/head
authorDonald Sharp <sharpd@nvidia.com>
Wed, 8 Jan 2025 14:42:49 +0000 (09:42 -0500)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Thu, 9 Jan 2025 21:41:33 +0000 (21:41 +0000)
The test starts with checking for rib insertion
of routes that may take some time after system
startup to come up.  Under heavy load this may
cause this test to just fail.  Give it more time.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 414bc26bc0537945679b499625eb81f173f52395)

tests/topotests/bgp_srv6l3vpn_to_bgp_vrf3/test_bgp_srv6l3vpn_to_bgp_vrf3.py

index bba0061858e4cb83755a83063f262586fa18f85c..530537646bb45279aaaad3b98089d2aa75000c24 100644 (file)
@@ -95,7 +95,7 @@ def open_json_file(filename):
         assert False, "Could not read file {}".format(filename)
 
 
-def check_rib(name, cmd, expected_file):
+def check_rib(name, cmd, expected_file, count=30, wait=0.5):
     def _check(name, dest_addr, match):
         logger.info("polling")
         tgen = get_topogen()
@@ -107,12 +107,12 @@ def check_rib(name, cmd, expected_file):
     logger.info('[+] check {} "{}" {}'.format(name, cmd, expected_file))
     tgen = get_topogen()
     func = functools.partial(_check, name, cmd, expected_file)
-    _, result = topotest.run_and_expect(func, None, count=10, wait=0.5)
+    _, result = topotest.run_and_expect(func, None, count, wait)
     assert result is None, "Failed"
 
 
 def test_rib():
-    check_rib("r1", "show bgp ipv4 vpn json", "r1/vpnv4_rib.json")
+    check_rib("r1", "show bgp ipv4 vpn json", "r1/vpnv4_rib.json", 120, 1)
     check_rib("r2", "show bgp ipv4 vpn json", "r2/vpnv4_rib.json")
     check_rib("r1", "show ip route vrf vrf10 json", "r1/vrf10v4_rib.json")
     check_rib("r1", "show ip route vrf vrf20 json", "r1/vrf20v4_rib.json")