diff --git a/tests/topotests/bgp_vpnv4_per_nexthop_label/test_bgp_vpnv4_per_nexthop_label.py b/tests/topotests/bgp_vpnv4_per_nexthop_label/test_bgp_vpnv4_per_nexthop_label.py index 201c1bf2d2ea..13bf1a3c2b99 100644 --- a/tests/topotests/bgp_vpnv4_per_nexthop_label/test_bgp_vpnv4_per_nexthop_label.py +++ b/tests/topotests/bgp_vpnv4_per_nexthop_label/test_bgp_vpnv4_per_nexthop_label.py @@ -187,7 +187,7 @@ def bgp_vpnv4_table_check( test_func = functools.partial( check_bgp_vpnv4_prefix_presence, router, prefix, table_version ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "{}, prefix ipv4 vpn {} is not installed yet".format( router.name, prefix ) @@ -321,7 +321,7 @@ def mpls_table_check(router, blacklist=None, label_list=None, whitelist=None): test_func = functools.partial( check_show_mpls_table, router, blacklist, label_list, whitelist ) - success, result = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, result = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "{}, MPLS labels check fail: {}".format(router.name, result) @@ -447,7 +447,7 @@ def test_protocols_convergence(): "show bgp vrf vrf1 ipv4 json", expected, ) - _, result = topotest.run_and_expect(test_func, None, count=20, wait=0.5) + _, result = topotest.run_and_expect(test_func, None, count=10, wait=3) assertmsg = '"{}" JSON output mismatches'.format(router.name) assert result is None, assertmsg @@ -461,7 +461,7 @@ def test_protocols_convergence(): "show bgp ipv4 vpn json", expected, ) - _, result = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + _, result = topotest.run_and_expect(test_func, None, count=10, wait=3) assertmsg = '"{}" JSON output mismatches'.format(router.name) assert result is None, assertmsg @@ -503,7 +503,7 @@ def _bgp_prefix_not_found(router, vrf, ipversion, prefix): test_func = functools.partial( _bgp_prefix_not_found, tgen.gears["r1"], "vrf1", "ipv4", "172.31.0.11/32" ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert ( success ), "r1, prefix 172.31.0.11/32 from r11 did not disappear. r11 still connected to rr ?" @@ -541,7 +541,7 @@ def test_flapping_bgp_vrf_up(): "172.31.0.11/32", "444:1", ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert ( success ), "r2, prefix 172.31.0.11/32 from r11 not present. r11 still disconnected from rr ?" @@ -571,7 +571,7 @@ def test_recursive_route(): "172.31.0.30/32", "444:1", ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r2, vpnv4 update 172.31.0.30 not found" bgp_vpnv4_table_check(tgen.gears["r2"], group=PREFIXES_R11 + ["172.31.0.30/32"]) @@ -597,7 +597,7 @@ def test_recursive_route(): "172.31.0.30/32", "444:1", ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r2, vpnv4 update 172.31.0.30 still present" @@ -623,7 +623,7 @@ def test_prefix_changes_interface(): "172.31.0.50/32", "444:1", ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r2, vpnv4 update 172.31.0.50 not found" # diagnostic @@ -669,7 +669,7 @@ def test_prefix_changes_interface(): "444:1", label=oldlabel, ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert ( success ), "r2, vpnv4 update 172.31.0.50 with old label {0} still present".format(oldlabel) @@ -686,7 +686,7 @@ def test_prefix_changes_interface(): "172.31.0.50/32", "444:1", ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r2, vpnv4 update 172.31.0.50 not found" label_list = set() @@ -751,9 +751,10 @@ def test_changing_default_label_value(): "r1, mpls table, check that MPLS entry with inLabel set to 222 has vrf1 interface" ) test_func = functools.partial( - check_show_mpls_table_entry_label_found, router, 222, "vrf1" + check_show_mpls_table_entry_label_found, tgen.gears["r1"], router, + "vrf1", label=222 ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r1, mpls entry with label 222 not found" # check label repartition is ok @@ -801,7 +802,7 @@ def test_unconfigure_allocation_mode_nexthop(): test_func = functools.partial( check_show_mpls_table_entry_label_not_found, router, 17 ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r1, mpls entry with label 17 still present" # Check vpnv4 routes from r1 @@ -853,7 +854,7 @@ def test_reconfigure_allocation_mode_nexthop(): test_func = functools.partial( check_show_mpls_table_entry_label_not_found, router, 17 ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r1, mpls entry with label 17 still present" # Check vpnv4 routes from r1 diff --git a/tests/topotests/bgp_vpnv6_per_nexthop_label/test_bgp_vpnv6_per_nexthop_label.py b/tests/topotests/bgp_vpnv6_per_nexthop_label/test_bgp_vpnv6_per_nexthop_label.py index f185a98f062b..47f0e70ab756 100644 --- a/tests/topotests/bgp_vpnv6_per_nexthop_label/test_bgp_vpnv6_per_nexthop_label.py +++ b/tests/topotests/bgp_vpnv6_per_nexthop_label/test_bgp_vpnv6_per_nexthop_label.py @@ -186,7 +186,7 @@ def bgp_vpnv6_table_check( test_func = functools.partial( check_bgp_vpnv6_prefix_presence, router, prefix, table_version ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "{}, prefix ipv6 vpn {} is not installed yet".format( router.name, prefix ) @@ -316,7 +316,7 @@ def mpls_table_check(router, blacklist=None, label_list=None, whitelist=None): test_func = functools.partial( check_show_mpls_table, router, blacklist, label_list, whitelist ) - success, result = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, result = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "{}, MPLS labels check fail: {}".format(router.name, result) @@ -446,7 +446,7 @@ def test_protocols_convergence(): "show bgp vrf vrf1 ipv6 json", expected, ) - _, result = topotest.run_and_expect(test_func, None, count=20, wait=0.5) + _, result = topotest.run_and_expect(test_func, None, count=10, wait=3) assertmsg = '"{}" JSON output mismatches'.format(router.name) assert result is None, assertmsg @@ -460,7 +460,7 @@ def test_protocols_convergence(): "show bgp ipv6 vpn json", expected, ) - _, result = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + _, result = topotest.run_and_expect(test_func, None, count=10, wait=3) assertmsg = '"{}" JSON output mismatches'.format(router.name) assert result is None, assertmsg @@ -502,7 +502,7 @@ def _bgp_prefix_not_found(router, vrf, ipversion, prefix): test_func = functools.partial( _bgp_prefix_not_found, tgen.gears["r1"], "vrf1", "ipv6", "172:31::11/128" ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert ( success ), "r1, prefix 172:31::11/128 from r11 did not disappear. r11 still connected to rr ?" @@ -544,7 +544,7 @@ def test_flapping_bgp_vrf_up(): "172:31::11/128", "444:1", ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert ( success ), "r2, prefix 172:31::11/128 from r11 not present. r11 still disconnected from rr ?" @@ -582,7 +582,7 @@ def _prefix30_found(router): # Check r2 received vpnv6 update with 172:31::30 test_func = functools.partial(_prefix30_found, tgen.gears["r2"]) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r2, VPNv6 update 172:31::30 not found" # that route should be sent along with label for 192::2:11 @@ -605,7 +605,7 @@ def _prefix30_found(router): # Check r2 removed 172:31::30 vpnv6 update test_func = functools.partial(_prefix30_not_found, tgen.gears["r2"]) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r2, VPNv6 update 172:31::30 still present" @@ -631,7 +631,7 @@ def test_prefix_changes_interface(): "172:31::50/128", "444:1", ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r2, VPNv6 update 172:31::50 not found" # diagnostic @@ -677,7 +677,7 @@ def test_prefix_changes_interface(): "444:1", label=oldlabel, ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert ( success ), "r2, vpnv6 update 172:31::50 with old label {0} still present".format(oldlabel) @@ -694,7 +694,7 @@ def test_prefix_changes_interface(): "172:31::50/128", "444:1", ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r2, vpnv6 update 172:31::50 not found" label_list = set() @@ -762,7 +762,7 @@ def test_changing_default_label_value(): check_show_mpls_table_entry_label_found, tgen.gears["r1"], router, "vrf1", label=222 ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r1, mpls entry with label 222 not found" # check label repartition is ok @@ -808,7 +808,7 @@ def test_unconfigure_allocation_mode_nexthop(): test_func = functools.partial( check_show_mpls_table_entry_label_not_found, router, 17 ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r1, mpls entry with label 17 still present" # Check vpnv6 routes from r1 @@ -857,7 +857,7 @@ def test_reconfigure_allocation_mode_nexthop(): test_func = functools.partial( check_show_mpls_table_entry_label_not_found, router, 17 ) - success, _ = topotest.run_and_expect(test_func, None, count=10, wait=0.5) + success, _ = topotest.run_and_expect(test_func, None, count=10, wait=3) assert success, "r1, mpls entry with label 17 still present" # Check vpnv6 routes from r1