diff options
Diffstat (limited to 'tests')
24 files changed, 457 insertions, 462 deletions
diff --git a/tests/topotests/bgp_basic_functionality_topo1/test_bgp_basic_functionality.py b/tests/topotests/bgp_basic_functionality_topo1/test_bgp_basic_functionality.py index b18e32f6bd..42b9b8adb9 100644 --- a/tests/topotests/bgp_basic_functionality_topo1/test_bgp_basic_functionality.py +++ b/tests/topotests/bgp_basic_functionality_topo1/test_bgp_basic_functionality.py @@ -121,7 +121,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.15") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.15") testsuite_run_time = time.asctime(time.localtime(time.time())) logger.info("Testsuite start time: {}".format(testsuite_run_time)) @@ -1148,9 +1148,9 @@ def test_bgp_with_loopback_with_same_subnet_p1(request): tgen, addr_type, dut, input_dict_r1, expected=False ) # pylint: disable=E1123 assert result is not True, ( - "Testcase {} : Failed \n".format(tc_name) - + "Expected behavior: routes should not present in fib \n" - + "Error: {}".format(result) + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) step("Verify Ipv4 and Ipv6 network installed in r3 RIB but not in FIB") @@ -1169,9 +1169,9 @@ def test_bgp_with_loopback_with_same_subnet_p1(request): tgen, addr_type, dut, input_dict_r1, expected=False ) # pylint: disable=E1123 assert result is not True, ( - "Testcase {} : Failed \n".format(tc_name) - + "Expected behavior: routes should not present in fib \n" - + "Error: {}".format(result) + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) write_test_footer(tc_name) diff --git a/tests/topotests/bgp_communities_topo1/test_bgp_communities.py b/tests/topotests/bgp_communities_topo1/test_bgp_communities.py index e4c25ff5cb..1c1a5cdfe4 100644 --- a/tests/topotests/bgp_communities_topo1/test_bgp_communities.py +++ b/tests/topotests/bgp_communities_topo1/test_bgp_communities.py @@ -83,7 +83,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.15") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >= 4.15") testsuite_run_time = time.asctime(time.localtime(time.time())) logger.info("Testsuite start time: {}".format(testsuite_run_time)) @@ -317,17 +317,18 @@ def test_bgp_no_advertise_community_p0(request): ) result = verify_bgp_rib(tgen, addr_type, dut, input_dict, expected=False) - assert result is not True, "Testcase {} : Failed \n ".format( - tc_name - ) + " Routes still present in R3 router. Error: {}".format(result) + assert result is not True, ( + "Testcase {} : Failed \n Expected: " + "Routes still present in {} router. Found: {}".format(tc_name, dut, result) + ) result = verify_rib( tgen, addr_type, dut, input_dict, protocol=protocol, expected=False ) assert ( result is not True - ), "Testcase {} : Failed \n Routes still present in R3 router. Error: {}".format( - tc_name, result + ), "Testcase {} : Failed \n Expected: Routes still present in {} router. Found: {}".format( + tc_name, dut, result ) step("Remove and Add no advertise community") diff --git a/tests/topotests/bgp_communities_topo1/test_bgp_communities_topo2.py b/tests/topotests/bgp_communities_topo1/test_bgp_communities_topo2.py index f6ee9ea795..a93061740f 100644 --- a/tests/topotests/bgp_communities_topo1/test_bgp_communities_topo2.py +++ b/tests/topotests/bgp_communities_topo1/test_bgp_communities_topo2.py @@ -87,7 +87,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.14") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >= 4.14") testsuite_run_time = time.asctime(time.localtime(time.time())) logger.info("Testsuite start time: {}".format(testsuite_run_time)) @@ -305,8 +305,10 @@ def test_bgp_no_export_local_as_and_internet_communities_p0(request): ], expected=False, ) - assert result is not True, "Testcase {} : Failed \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes are still present in rib of r3 \n " + "Found: {}".format(tc_name, result) ) step("Remove route-map from redistribute static on R1") diff --git a/tests/topotests/bgp_ecmp_topo2/test_ebgp_ecmp_topo2.py b/tests/topotests/bgp_ecmp_topo2/test_ebgp_ecmp_topo2.py index 2784e956fa..8fd0120dd8 100644 --- a/tests/topotests/bgp_ecmp_topo2/test_ebgp_ecmp_topo2.py +++ b/tests/topotests/bgp_ecmp_topo2/test_ebgp_ecmp_topo2.py @@ -90,7 +90,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.15") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.15") testsuite_run_time = time.asctime(time.localtime(time.time())) logger.info("Testsuite start time: {}".format(testsuite_run_time)) @@ -436,7 +436,9 @@ def test_ecmp_remove_redistribute_static(request): ) assert ( result is not True - ), "Testcase {} : Failed \n Routes still" " present in RIB".format(tc_name) + ), "Testcase {} : Failed \n Expected: Routes still present in {} RIB. Found: {}".format( + tc_name, dut, result + ) logger.info("Enable redistribute static") input_dict_2 = { @@ -621,7 +623,9 @@ def test_ecmp_remove_static_route(request): ) assert ( result is not True - ), "Testcase {} : Failed \n Routes still" " present in RIB".format(tc_name) + ), "Testcase {} : Failed \n Expected: Routes still present in {} RIB. Found: {}".format( + tc_name, dut, result + ) for addr_type in ADDR_TYPES: # Enable static routes @@ -727,7 +731,9 @@ def test_ecmp_remove_nw_advertise(request): ) assert ( result is not True - ), "Testcase {} : Failed \n Routes still" " present in RIB".format(tc_name) + ), "Testcase {} : Failed \n Expected: Routes still present in {} RIB. Found: {}".format( + tc_name, dut, result + ) static_or_nw(tgen, topo, tc_name, "advertise_nw", "r2") for addr_type in ADDR_TYPES: diff --git a/tests/topotests/bgp_ecmp_topo2/test_ibgp_ecmp_topo2.py b/tests/topotests/bgp_ecmp_topo2/test_ibgp_ecmp_topo2.py index 704e8fdf04..185a086838 100644 --- a/tests/topotests/bgp_ecmp_topo2/test_ibgp_ecmp_topo2.py +++ b/tests/topotests/bgp_ecmp_topo2/test_ibgp_ecmp_topo2.py @@ -90,7 +90,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.15") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.15") testsuite_run_time = time.asctime(time.localtime(time.time())) logger.info("Testsuite start time: {}".format(testsuite_run_time)) @@ -437,7 +437,9 @@ def test_ecmp_remove_redistribute_static(request): ) assert ( result is not True - ), "Testcase {} : Failed \n Routes still" " present in RIB".format(tc_name) + ), "Testcase {} : Failed \n Expected: Routes still present in {} RIB. Found: {}".format( + tc_name, dut, result + ) logger.info("Enable redistribute static") input_dict_2 = { @@ -622,7 +624,9 @@ def test_ecmp_remove_static_route(request): ) assert ( result is not True - ), "Testcase {} : Failed \n Routes still" " present in RIB".format(tc_name) + ), "Testcase {} : Failed \n Expected: Routes still present in {} RIB. Found: {}".format( + tc_name, dut, result + ) for addr_type in ADDR_TYPES: # Enable static routes @@ -730,7 +734,9 @@ def test_ecmp_remove_nw_advertise(request): ) assert ( result is not True - ), "Testcase {} : Failed \n Routes still" " present in RIB".format(tc_name) + ), "Testcase {} : Failed \n Expected: Routes still present in {} RIB. Found: {}".format( + tc_name, dut, result + ) static_or_nw(tgen, topo, tc_name, "advertise_nw", "r2") for addr_type in ADDR_TYPES: diff --git a/tests/topotests/bgp_ecmp_topo3/test_ibgp_ecmp_topo3.py b/tests/topotests/bgp_ecmp_topo3/test_ibgp_ecmp_topo3.py index 2a51dc83ef..9b6480c0d3 100644 --- a/tests/topotests/bgp_ecmp_topo3/test_ibgp_ecmp_topo3.py +++ b/tests/topotests/bgp_ecmp_topo3/test_ibgp_ecmp_topo3.py @@ -240,17 +240,18 @@ def test_ecmp_fast_convergence(request, test_type, tgen, topo): logger.info("Ensure BGP has processed the cli") r2 = tgen.gears["r2"] output = r2.vtysh_cmd("show run") - verify = re.search(r"fast-convergence", output ) - assert verify is not None, ( - "r2 does not have the fast convergence command yet") + verify = re.search(r"fast-convergence", output) + assert verify is not None, "r2 does not have the fast convergence command yet" logger.info("Shutdown one link b/w r2 and r3") shutdown_bringup_interface(tgen, "r2", intf1, False) logger.info("Verify bgp neighbors goes down immediately") result = verify_bgp_convergence(tgen, topo, dut="r2", expected=False) - assert result is not True, "Testcase {} : Failed \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: BGP should not be converged for {} \n " + "Found: {}".format(tc_name, "r2", result) ) logger.info("Shutdown second link b/w r2 and r3") @@ -258,8 +259,10 @@ def test_ecmp_fast_convergence(request, test_type, tgen, topo): logger.info("Verify bgp neighbors goes down immediately") result = verify_bgp_convergence(tgen, topo, dut="r2", expected=False) - assert result is not True, "Testcase {} : Failed \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: BGP should not be converged for {} \n " + "Found: {}".format(tc_name, "r2", result) ) write_test_footer(tc_name) diff --git a/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-1.py b/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-1.py index f155325502..deca4bcfd7 100644 --- a/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-1.py +++ b/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-1.py @@ -160,7 +160,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.16") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.16") testsuite_run_time = time.asctime(time.localtime(time.time())) logger.info("Testsuite start time: {}".format(testsuite_run_time)) @@ -1033,11 +1033,9 @@ def test_BGP_GR_TC_4_p0(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes result = verify_rib( @@ -1045,9 +1043,9 @@ def test_BGP_GR_TC_4_p0(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) logger.info("[Phase 5] : R2 is about to come up now ") start_router_daemons(tgen, "r2", ["bgpd"]) @@ -1506,10 +1504,10 @@ def test_BGP_GR_TC_6_1_2_p1(request): result = verify_r_bit( tgen, topo, addr_type, input_dict, dut="r2", peer="r1", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r2: R-bit is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: R-bit should not be set to True in r2\n" + "Found: {}".format(tc_name, result) ) logger.info("Restart BGPd on R2 ") @@ -1528,10 +1526,10 @@ def test_BGP_GR_TC_6_1_2_p1(request): result = verify_r_bit( tgen, topo, addr_type, input_dict, dut="r2", peer="r1", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r2: R-bit is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: R-bit should not be set to True in r2\n" + "Found: {}".format(tc_name, result) ) write_test_footer(tc_name) diff --git a/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-2.py b/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-2.py index dda3bd4b30..a92fde2d0d 100644 --- a/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-2.py +++ b/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-2.py @@ -160,7 +160,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.16") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.16") testsuite_run_time = time.asctime(time.localtime(time.time())) logger.info("Testsuite start time: {}".format(testsuite_run_time)) diff --git a/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-3.py b/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-3.py index e4b533b295..b0166033df 100644 --- a/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-3.py +++ b/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-3.py @@ -160,7 +160,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.16") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.16") testsuite_run_time = time.asctime(time.localtime(time.time())) logger.info("Testsuite start time: {}".format(testsuite_run_time)) @@ -829,11 +829,9 @@ def test_BGP_GR_TC_20_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes result = verify_rib( @@ -841,9 +839,9 @@ def test_BGP_GR_TC_20_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) logger.info("[Phase 5] : R2 is about to come up now ") @@ -1117,7 +1115,8 @@ def test_BGP_GR_TC_31_1_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) logger.info("[Phase 4] : R1 is about to come up now ") @@ -1599,11 +1598,9 @@ def test_BGP_GR_TC_9_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes protocol = "bgp" @@ -1612,9 +1609,9 @@ def test_BGP_GR_TC_9_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) logger.info("[Phase 5] : R2 is about to come up now ") start_router_daemons(tgen, "r2", ["bgpd"]) @@ -1643,10 +1640,10 @@ def test_BGP_GR_TC_9_p1(request): result = verify_f_bit( tgen, topo, addr_type, input_dict, dut="r1", peer="r2", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r1: F-bit is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: F-bit should not be set to True in r1\n" + "Found: {}".format(tc_name, result) ) write_test_footer(tc_name) @@ -1781,11 +1778,9 @@ def test_BGP_GR_TC_17_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes protocol = "bgp" @@ -1794,9 +1789,9 @@ def test_BGP_GR_TC_17_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) logger.info("[Phase 5] : R2 is about to come up now ") start_router_daemons(tgen, "r2", ["bgpd"]) @@ -1817,10 +1812,10 @@ def test_BGP_GR_TC_17_p1(request): result = verify_r_bit( tgen, topo, addr_type, input_dict, dut="r1", peer="r2", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r1: R-bit is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: R-bit should not be set to True in r1\n" + "Found: {}".format(tc_name, result) ) # Verifying BGP RIB routes @@ -2026,10 +2021,10 @@ def test_BGP_GR_TC_43_p1(request): result = verify_rib( tgen, addr_type, dut, input_topo, next_hop, protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} :Failed \n Routes are still present \n Error {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) dut = "r2" @@ -2043,18 +2038,18 @@ def test_BGP_GR_TC_43_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r2: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) + protocol = "bgp" result = verify_rib( tgen, addr_type, dut, input_topo, next_hop, protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} :Failed \n Routes are still present \n Error {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) step( @@ -2353,17 +2348,17 @@ def test_BGP_GR_TC_44_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) + result = verify_rib( tgen, addr_type, dut, input_topo, next_hop, protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} :Failed \n Routes are still present \n Error {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) step("Bring up BGPd on R2 and remove GR related config from R1 in global level") diff --git a/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-4.py b/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-4.py index 835ef41de1..f408ff4854 100644 --- a/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-4.py +++ b/tests/topotests/bgp_gr_functionality_topo1/test_bgp_gr_functionality_topo1-4.py @@ -160,7 +160,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.16") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.16") testsuite_run_time = time.asctime(time.localtime(time.time())) logger.info("Testsuite start time: {}".format(testsuite_run_time)) @@ -1157,7 +1157,8 @@ def test_BGP_GR_TC_48_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) dut = "r2" @@ -1171,16 +1172,17 @@ def test_BGP_GR_TC_48_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r2: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) + result = verify_rib( tgen, addr_type, dut, input_topo, next_hop, protocol, expected=False ) assert result is not True, ( "Testcase {} : Failed \n " - "r2: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) step("Bring up BGP on R1 and remove Peer-level GR config from R1") @@ -1542,16 +1544,17 @@ def BGP_GR_TC_52_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) + result = verify_rib( tgen, addr_type, dut, input_topo, next_hop, protocol, expected=False ) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) step("Bring up BGP on R2 and remove Peer-level GR config from R1") diff --git a/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-1.py b/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-1.py index 3afe38857b..293f3042eb 100644 --- a/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-1.py +++ b/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-1.py @@ -155,7 +155,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.16") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.16") global ADDR_TYPES @@ -528,10 +528,10 @@ def test_BGP_GR_TC_3_p0(request): result = verify_eor( tgen, topo, addr_type, input_dict, dut="r2", peer="r1", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r2: EOR is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: EOR should not be set to True in r2\n" + "Found: {}".format(tc_name, result) ) logger.info( @@ -675,10 +675,10 @@ def test_BGP_GR_TC_11_p0(request): result = verify_eor( tgen, topo, addr_type, input_dict, dut="r1", peer="r3", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r1: EOR is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: EOR should not be set to True in r1\n" + "Found: {}".format(tc_name, result) ) logger.info( @@ -706,10 +706,10 @@ def test_BGP_GR_TC_11_p0(request): result = verify_eor( tgen, topo, addr_type, input_dict, dut="r3", peer="r1", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r3: EOR is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: EOR should not be set to True in r3\n" + "Found: {}".format(tc_name, result) ) write_test_footer(tc_name) @@ -1474,38 +1474,33 @@ def test_BGP_GR_18_p1(request): result = verify_bgp_rib(tgen, addr_type, dut, input_dict_1, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r6: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes before shutting down BGPd daemon result = verify_rib(tgen, addr_type, dut, input_dict_1, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r6: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying BGP RIB routes dut = "r2" - result = verify_bgp_rib(tgen, addr_type, dut, input_dict_1, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r2: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes before shutting down BGPd daemon result = verify_rib(tgen, addr_type, dut, input_dict_1, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r6: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) write_test_footer(tc_name) diff --git a/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-2.py b/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-2.py index 535f272ef4..fe885372d5 100644 --- a/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-2.py +++ b/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-2.py @@ -155,7 +155,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.16") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.16") global ADDR_TYPES @@ -726,19 +726,17 @@ def test_BGP_GR_chaos_29_p1(request): result = verify_bgp_rib(tgen, addr_type, dut, input_dict, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes before shutting down BGPd daemon result = verify_rib(tgen, addr_type, dut, input_dict, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) logger.info("[Step 4] : Start BGPd daemon on R1..") @@ -981,11 +979,9 @@ def test_BGP_GR_chaos_33_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) if addr_type == "ipv6": if "link_local" in PREFERRED_NEXT_HOP: @@ -998,11 +994,9 @@ def test_BGP_GR_chaos_33_p1(request): ) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in ZEBRA\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) logger.info("[Step 4] : Start BGPd daemon on R1 and R4..") @@ -1182,31 +1176,28 @@ def test_BGP_GR_chaos_34_2_p1(request): result = verify_f_bit( tgen, topo, addr_type, input_dict, "r3", "r1", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r3: F-bit is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: F-bit should not be set to True in r3\n" + "Found: {}".format(tc_name, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying BGP RIB routes after starting BGPd daemon input_dict_1 = {key: topo["routers"][key] for key in ["r1"]} result = verify_bgp_rib(tgen, addr_type, dut, input_dict_1, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes result = verify_rib(tgen, addr_type, dut, input_dict_1, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) write_test_footer(tc_name) diff --git a/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-3.py b/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-3.py index e60552ed10..4ff62a9785 100644 --- a/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-3.py +++ b/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-3.py @@ -155,7 +155,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.16") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.16") global ADDR_TYPES @@ -380,12 +380,11 @@ def test_BGP_GR_chaos_34_1_p1(request): result = verify_f_bit( tgen, topo, addr_type, input_dict_2, "r3", "r1", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r3: F-bit is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: F-bit should not be set to True in r3\n" + "Found: {}".format(tc_name, result) ) - logger.info(" Expected behavior: {}".format(result)) logger.info("[Step 3] : Kill BGPd daemon on R1..") @@ -402,19 +401,17 @@ def test_BGP_GR_chaos_34_1_p1(request): result = verify_bgp_rib(tgen, addr_type, dut, input_dict, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes result = verify_rib(tgen, addr_type, dut, input_dict, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Start BGPd daemon on R1 start_router_daemons(tgen, "r1", ["bgpd"]) @@ -587,31 +584,28 @@ def test_BGP_GR_chaos_32_p1(request): result = verify_eor( tgen, topo, addr_type, input_dict_3, dut="r5", peer="r1", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r5: EOR is set to TRUE\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: EOR should not be set to True in r5\n" + "Found: {}".format(tc_name, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying BGP RIB routes after starting BGPd daemon input_dict_1 = {key: topo["routers"][key] for key in ["r5"]} result = verify_bgp_rib(tgen, addr_type, dut, input_dict_1, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes result = verify_rib(tgen, addr_type, dut, input_dict_1, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) write_test_footer(tc_name) @@ -716,12 +710,11 @@ def test_BGP_GR_chaos_37_p1(request): result = verify_eor( tgen, topo, addr_type, input_dict, dut="r3", peer="r1", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r3: EOR is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: EOR should not be set to True in r3\n" + "Found: {}".format(tc_name, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying BGP RIB routes after starting BGPd daemon dut = "r1" @@ -783,10 +776,10 @@ def test_BGP_GR_chaos_37_p1(request): result = verify_eor( tgen, topo, addr_type, input_dict_3, dut="r1", peer="r3", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r1: EOR is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: EOR should not be set to True in r1\n" + "Found: {}".format(tc_name, result) ) write_test_footer(tc_name) @@ -941,19 +934,17 @@ def test_BGP_GR_chaos_30_p1(request): result = verify_bgp_rib(tgen, addr_type, dut, input_dict, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes before shutting down BGPd daemon result = verify_rib(tgen, addr_type, dut, input_dict, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) write_test_footer(tc_name) @@ -1356,7 +1347,8 @@ def BGP_GR_TC_7_p1(request): result = verify_rib(tgen, addr_type, dut, input_dict_1, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r1: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) write_test_footer(tc_name) diff --git a/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-4.py b/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-4.py index 1df77ebeb2..fd1ef097c4 100644 --- a/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-4.py +++ b/tests/topotests/bgp_gr_functionality_topo2/test_bgp_gr_functionality_topo2-4.py @@ -157,7 +157,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.16") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.16") global ADDR_TYPES @@ -420,10 +420,10 @@ def test_BGP_GR_TC_23_p1(request): result = verify_eor( tgen, topo, addr_type, input_dict, dut="r1", peer="r2", expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n " "r1: EOR is set to True\n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: EOR should not be set to True in r2\n" + "Found: {}".format(tc_name, result) ) # Verifying BGP RIB routes received from router R1 @@ -547,19 +547,17 @@ def test_BGP_GR_20_p1(request): result = verify_bgp_rib(tgen, addr_type, dut, input_dict_1, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in BGP RIB\n Error: {}".format( - tc_name, result - ) + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Verifying RIB routes before shutting down BGPd daemon result = verify_rib(tgen, addr_type, dut, input_dict_1, expected=False) assert result is not True, ( "Testcase {} : Failed \n " - "r3: routes are still present in ZEBRA\n Error: {}".format(tc_name, result) + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info(" Expected behavior: {}".format(result)) # Start BGPd daemon on R1 start_router_daemons(tgen, "r1", ["bgpd"]) diff --git a/tests/topotests/bgp_gr_functionality_topo3/bgp_gr_functionality_topo3.py b/tests/topotests/bgp_gr_functionality_topo3/bgp_gr_functionality_topo3.py index 6bf8b96309..76522206a4 100644 --- a/tests/topotests/bgp_gr_functionality_topo3/bgp_gr_functionality_topo3.py +++ b/tests/topotests/bgp_gr_functionality_topo3/bgp_gr_functionality_topo3.py @@ -56,15 +56,20 @@ from lib.bgp import ( verify_graceful_restart_timers, verify_bgp_convergence_from_running_config, ) + # Import common_config to use commomnly used APIs -from lib.common_config import (create_common_configuration, - InvalidCLIError, retry, - generate_ips, FRRCFG_FILE, - find_interface_with_greater_ip, - check_address_types, - validate_ip_address, - run_frr_cmd, - get_frr_ipv6_linklocal) +from lib.common_config import ( + create_common_configuration, + InvalidCLIError, + retry, + generate_ips, + FRRCFG_FILE, + find_interface_with_greater_ip, + check_address_types, + validate_ip_address, + run_frr_cmd, + get_frr_ipv6_linklocal, +) from lib.common_config import ( write_test_header, @@ -108,8 +113,7 @@ NEXT_HOP_IP = {"ipv4": "Null0", "ipv6": "Null0"} PREFERRED_NEXT_HOP = "link_local" -def configure_gr_followed_by_clear(tgen, topo, input_dict, tc_name, - dut, peer): +def configure_gr_followed_by_clear(tgen, topo, input_dict, tc_name, dut, peer): """ result = configure_gr_followed_by_clear(tgen, topo, dut) assert result is True, \ @@ -118,8 +122,7 @@ def configure_gr_followed_by_clear(tgen, topo, input_dict, tc_name, """ result = create_router_bgp(tgen, topo, input_dict) - assert result is True, "Testcase {} : Failed \n Error: {}".format( - tc_name, result) + assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) for addr_type in ADDR_TYPES: clear_bgp(tgen, addr_type, dut) @@ -131,6 +134,7 @@ def configure_gr_followed_by_clear(tgen, topo, input_dict, tc_name, return True + def verify_stale_routes_list(tgen, addr_type, dut, input_dict): """ This API is use verify Stale routes on refering the network with next hop value @@ -175,8 +179,8 @@ def verify_stale_routes_list(tgen, addr_type, dut, input_dict): command = "show bgp" # Static routes sleep(2) - logger.info('Checking router {} BGP RIB:'.format(dut)) - if 'static_routes' in input_dict[routerInput]: + logger.info("Checking router {} BGP RIB:".format(dut)) + if "static_routes" in input_dict[routerInput]: static_routes = input_dict[routerInput]["static_routes"] for static_route in static_routes: found_routes = [] @@ -185,30 +189,27 @@ def verify_stale_routes_list(tgen, addr_type, dut, input_dict): nh_found = False vrf = static_route.setdefault("vrf", None) community = static_route.setdefault("community", None) - largeCommunity = \ - static_route.setdefault("largeCommunity", None) + largeCommunity = static_route.setdefault("largeCommunity", None) if vrf: - cmd = "{} vrf {} {}".\ - format(command, vrf, addr_type) + cmd = "{} vrf {} {}".format(command, vrf, addr_type) if community: - cmd = "{} community {}".\ - format(cmd, community) + cmd = "{} community {}".format(cmd, community) if largeCommunity: - cmd = "{} large-community {}".\ - format(cmd, largeCommunity) + cmd = "{} large-community {}".format(cmd, largeCommunity) else: - cmd = "{} {}".\ - format(command, addr_type) + cmd = "{} {}".format(command, addr_type) cmd = "{} json".format(cmd) rib_routes_json = run_frr_cmd(rnode, cmd, isjson=True) # Verifying output dictionary rib_routes_json is not empty if bool(rib_routes_json) == False: - errormsg = "[DUT: {}]: No route found in rib of router". \ - format(router) + errormsg = "[DUT: {}]: No route found in rib of router".format( + router + ) return errormsg elif "warning" in rib_routes_json: - errormsg = "[DUT: {}]: {}". \ - format(router, rib_routes_json["warning"]) + errormsg = "[DUT: {}]: {}".format( + router, rib_routes_json["warning"] + ) return errormsg network = static_route["network"] if "no_of_ip" in static_route: @@ -227,15 +228,18 @@ def verify_stale_routes_list(tgen, addr_type, dut, input_dict): st_found = True found_routes.append(st_rt) - for mnh in range(0, len(rib_routes_json[ - 'routes'][st_rt])): - found_hops.append([rib_r[ - "ip"] for rib_r in rib_routes_json[ - 'routes'][st_rt][ - mnh]["nexthops"]]) + for mnh in range(0, len(rib_routes_json["routes"][st_rt])): + found_hops.append( + [ + rib_r["ip"] + for rib_r in rib_routes_json["routes"][st_rt][ + mnh + ]["nexthops"] + ] + ) return found_hops else: - return 'error msg - no hops found' + return "error msg - no hops found" def setup_module(mod): @@ -248,7 +252,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.16") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.16") global ADDR_TYPES @@ -302,6 +306,8 @@ def teardown_module(mod): "Testsuite end time: {}".format(time.asctime(time.localtime(time.time()))) ) logger.info("=" * 40) + + ################################################################################ # # TEST CASES @@ -318,175 +324,160 @@ def test_bgp_gr_stale_routes(request): step("Creating 5 static Routes in Router R3 with NULL0 as Next hop") for addr_type in ADDR_TYPES: - input_dict_1 = { - "r3": { - "static_routes": [{ - "network": [NETWORK1_1[addr_type]] + [NETWORK1_2[addr_type]], - "next_hop": NEXT_HOP_IP[addr_type] - }, - { - "network": [NETWORK2_1[addr_type]] + [NETWORK2_2[addr_type]], - "next_hop": NEXT_HOP_IP[addr_type] - }, - { - "network": [NETWORK3_1[addr_type]] + [NETWORK3_2[addr_type]], - "next_hop": NEXT_HOP_IP[addr_type] - }, - { - "network": [NETWORK4_1[addr_type]] + [NETWORK4_2[addr_type]], - "next_hop": NEXT_HOP_IP[addr_type] - }, - { - "network": [NETWORK5_1[addr_type]] + [NETWORK5_2[addr_type]], - "next_hop": NEXT_HOP_IP[addr_type] - }] - } + input_dict_1 = { + "r3": { + "static_routes": [ + { + "network": [NETWORK1_1[addr_type]] + [NETWORK1_2[addr_type]], + "next_hop": NEXT_HOP_IP[addr_type], + }, + { + "network": [NETWORK2_1[addr_type]] + [NETWORK2_2[addr_type]], + "next_hop": NEXT_HOP_IP[addr_type], + }, + { + "network": [NETWORK3_1[addr_type]] + [NETWORK3_2[addr_type]], + "next_hop": NEXT_HOP_IP[addr_type], + }, + { + "network": [NETWORK4_1[addr_type]] + [NETWORK4_2[addr_type]], + "next_hop": NEXT_HOP_IP[addr_type], + }, + { + "network": [NETWORK5_1[addr_type]] + [NETWORK5_2[addr_type]], + "next_hop": NEXT_HOP_IP[addr_type], + }, + ] } - result = create_static_routes(tgen, input_dict_1) - assert result is True, 'Testcase {} : Failed \n Error: {}'.format( - tc_name, result) + } + result = create_static_routes(tgen, input_dict_1) + assert result is True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) step("verifying Created Route at R3 in VRF default") for addr_type in ADDR_TYPES: - dut = 'r3' - input_dict_1= {'r3': topo['routers']['r3']} + dut = "r3" + input_dict_1 = {"r3": topo["routers"]["r3"]} result = verify_bgp_rib(tgen, addr_type, dut, input_dict_1) - assert result is True, \ - "Testcase {} :Failed \n Error {}". \ - format(tc_name, result) - #done + assert result is True, "Testcase {} :Failed \n Error {}".format(tc_name, result) + # done step("verifying Created Route at R2 in VRF default") for addr_type in ADDR_TYPES: - dut = 'r2' - input_dict_1= {'r2': topo['routers']['r2']} + dut = "r2" + input_dict_1 = {"r2": topo["routers"]["r2"]} result = verify_bgp_rib(tgen, addr_type, dut, input_dict_1) - assert result is True, \ - "Testcase {} :Failed \n Error {}". \ - format(tc_name, result) + assert result is True, "Testcase {} :Failed \n Error {}".format(tc_name, result) step("importing vrf RED on R2 under Address Family") for addr_type in ADDR_TYPES: - input_import_vrf={ + input_import_vrf = { "r2": { "bgp": [ { "local_as": 200, "vrf": "RED", - "address_family": {addr_type: {"unicast": {"import": {"vrf": "default"}}}}, + "address_family": { + addr_type: {"unicast": {"import": {"vrf": "default"}}} + }, } ] } } - result = create_router_bgp(tgen, topo,input_import_vrf) - assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result) - #done + result = create_router_bgp(tgen, topo, input_import_vrf) + assert result is True, "Testcase {} : Failed \n Error: {}".format( + tc_name, result + ) + # done step("verifying static Routes at R2 in VRF RED") for addr_type in ADDR_TYPES: - dut = 'r2' - input_dict_1= {'r2': topo['routers']['r2']} + dut = "r2" + input_dict_1 = {"r2": topo["routers"]["r2"]} result = verify_bgp_rib(tgen, addr_type, dut, input_dict_1) - assert result is True, \ - "Testcase {} :Failed \n Error {}". \ - format(tc_name, result) + assert result is True, "Testcase {} :Failed \n Error {}".format(tc_name, result) step("verifying static Routes at R1 in VRF RED") for addr_type in ADDR_TYPES: - dut = 'r1' - input_dict_1= {'r1': topo['routers']['r1']} + dut = "r1" + input_dict_1 = {"r1": topo["routers"]["r1"]} result = verify_bgp_rib(tgen, addr_type, dut, input_dict_1) - assert result is True, \ - "Testcase {} :Failed \n Error {}". \ - format(tc_name, result) + assert result is True, "Testcase {} :Failed \n Error {}".format(tc_name, result) step("Configuring Graceful restart at R2 and R3 ") input_dict = { "r2": { - "bgp": { "local_as": "200", "graceful-restart": { "graceful-restart": True, - } + }, } }, "r3": { - "bgp": { - "local_as": "300", - "graceful-restart": { - "graceful-restart": True - } - } - } + "bgp": {"local_as": "300", "graceful-restart": {"graceful-restart": True}} + }, } - configure_gr_followed_by_clear(tgen, topo, input_dict, tc_name,dut='r2', peer='r3') - - + configure_gr_followed_by_clear(tgen, topo, input_dict, tc_name, dut="r2", peer="r3") step("verify Graceful restart at R2") for addr_type in ADDR_TYPES: - result = verify_graceful_restart(tgen, topo, addr_type, input_dict, - dut='r2', peer='r3') - assert result is True, \ - "Testcase {} :Failed \n Error {}". \ - format(tc_name, result) + result = verify_graceful_restart( + tgen, topo, addr_type, input_dict, dut="r2", peer="r3" + ) + assert result is True, "Testcase {} :Failed \n Error {}".format(tc_name, result) step("verify Graceful restart at R3") for addr_type in ADDR_TYPES: - result = verify_graceful_restart(tgen, topo, addr_type, input_dict, - dut='r3', peer='r2') - assert result is True, \ - "Testcase {} :Failed \n Error {}". \ - format(tc_name, result) + result = verify_graceful_restart( + tgen, topo, addr_type, input_dict, dut="r3", peer="r2" + ) + assert result is True, "Testcase {} :Failed \n Error {}".format(tc_name, result) step("Configuring Graceful-restart-disable at R3") input_dict = { "r2": { - "bgp": { "local_as": "200", "graceful-restart": { "graceful-restart": False, - } + }, } }, "r3": { - "bgp": { - "local_as": "300", - "graceful-restart": { - "graceful-restart": False - } - } - } + "bgp": {"local_as": "300", "graceful-restart": {"graceful-restart": False}} + }, } - configure_gr_followed_by_clear(tgen, topo, input_dict, tc_name,dut='r3', peer='r2') + configure_gr_followed_by_clear(tgen, topo, input_dict, tc_name, dut="r3", peer="r2") step("Verify Graceful-restart-disable at R3") for addr_type in ADDR_TYPES: - result = verify_graceful_restart(tgen, topo, addr_type, input_dict, - dut='r3', peer='r2') - assert result is True, \ - "Testcase {} :Failed \n Error {}". \ - format(tc_name, result) + result = verify_graceful_restart( + tgen, topo, addr_type, input_dict, dut="r3", peer="r2" + ) + assert result is True, "Testcase {} :Failed \n Error {}".format(tc_name, result) for iteration in range(5): step("graceful-restart-disable:True at R3") input_dict = { - "r3": { - "bgp": { - "graceful-restart": { - "graceful-restart-disable": True, + "r3": { + "bgp": { + "graceful-restart": { + "graceful-restart-disable": True, + } } } - } } - configure_gr_followed_by_clear(tgen, topo, input_dict, tc_name, - dut='r3', peer='r2') + configure_gr_followed_by_clear( + tgen, topo, input_dict, tc_name, dut="r3", peer="r2" + ) step("Verifying Routes at R2 on enabling GRD") - dut = 'r2' + dut = "r2" for addr_type in ADDR_TYPES: - input_dict_1= {'r2': topo['routers']['r2']} + input_dict_1 = {"r2": topo["routers"]["r2"]} result = verify_bgp_rib(tgen, addr_type, dut, input_dict_1) - assert result is True, "Testcase {} :Failed \n Error {}".format(tc_name, result) + assert result is True, "Testcase {} :Failed \n Error {}".format( + tc_name, result + ) step("Verify stale Routes in Router R2 enabling GRD") for addr_type in ADDR_TYPES: @@ -495,39 +486,45 @@ def test_bgp_gr_stale_routes(request): verify_nh_for_static_rtes = { "r3": { "static_routes": [ - { "network": [NETWORK1_1[addr_type]], "no_of_ip": 2, - "vrf": "RED" + "vrf": "RED", } ] } } bgp_rib_next_hops = verify_stale_routes_list( - tgen, addr_type, dut, verify_nh_for_static_rtes) - assert (len(bgp_rib_next_hops)== 1) is True, "Testcase {} : Failed \n Error: {}".format( - tc_name, bgp_rib_next_hops,expected=True) + tgen, addr_type, dut, verify_nh_for_static_rtes + ) + assert ( + len(bgp_rib_next_hops) == 1 + ) is True, "Testcase {} : Failed \n Error: {}".format( + tc_name, bgp_rib_next_hops, expected=True + ) step("graceful-restart-disable:False at R3") input_dict = { - "r3": { - "bgp": { - "graceful-restart": { - "graceful-restart-disable": False, + "r3": { + "bgp": { + "graceful-restart": { + "graceful-restart-disable": False, + } } } - } } - configure_gr_followed_by_clear(tgen, topo, input_dict, tc_name, - dut='r3', peer='r2') + configure_gr_followed_by_clear( + tgen, topo, input_dict, tc_name, dut="r3", peer="r2" + ) step("Verifying Routes at R2 on disabling GRD") - dut = 'r2' + dut = "r2" for addr_type in ADDR_TYPES: - input_dict_1= {'r2': topo['routers']['r2']} + input_dict_1 = {"r2": topo["routers"]["r2"]} result = verify_bgp_rib(tgen, addr_type, dut, input_dict_1) - assert result is True, "Testcase {} :Failed \n Error {}".format(tc_name, result) + assert result is True, "Testcase {} :Failed \n Error {}".format( + tc_name, result + ) step("Verify stale Routes in Router R2 on disabling GRD") for addr_type in ADDR_TYPES: @@ -536,19 +533,22 @@ def test_bgp_gr_stale_routes(request): verify_nh_for_static_rtes = { "r3": { "static_routes": [ - { "network": [NETWORK1_1[addr_type]], "no_of_ip": 2, - "vrf": "RED" + "vrf": "RED", } ] } } - bgp_rib_next_hops = verify_stale_routes_list(tgen, addr_type, dut, verify_nh_for_static_rtes) - - stale_route_status=len(bgp_rib_next_hops)== 1 - assert stale_route_status is True, "Testcase {} : Failed \n Error: {}".format( - tc_name, stale_route_status,expected=True) + bgp_rib_next_hops = verify_stale_routes_list( + tgen, addr_type, dut, verify_nh_for_static_rtes + ) + + stale_route_status = len(bgp_rib_next_hops) == 1 + assert ( + stale_route_status is True + ), "Testcase {} : Failed \n Error: {}".format( + tc_name, stale_route_status, expected=True + ) write_test_footer(tc_name) - diff --git a/tests/topotests/bgp_gshut_topo1/test_ebgp_gshut_topo1.py b/tests/topotests/bgp_gshut_topo1/test_ebgp_gshut_topo1.py index 58133c44a9..684d2fcb57 100644 --- a/tests/topotests/bgp_gshut_topo1/test_ebgp_gshut_topo1.py +++ b/tests/topotests/bgp_gshut_topo1/test_ebgp_gshut_topo1.py @@ -92,7 +92,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.16") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.16") testsuite_run_time = time.asctime(time.localtime(time.time())) logger.info("Testsuite start time: {}".format(testsuite_run_time)) diff --git a/tests/topotests/bgp_gshut_topo1/test_ibgp_gshut_topo1.py b/tests/topotests/bgp_gshut_topo1/test_ibgp_gshut_topo1.py index a79ce0e3a0..16572a7967 100644 --- a/tests/topotests/bgp_gshut_topo1/test_ibgp_gshut_topo1.py +++ b/tests/topotests/bgp_gshut_topo1/test_ibgp_gshut_topo1.py @@ -87,7 +87,7 @@ def setup_module(mod): # Required linux kernel version for this suite to run. result = required_linux_kernel_version("4.16") if result is not True: - pytest.skip("Kernel requirements are not met") + pytest.skip("Kernel requirements are not met, kernel version should be >=4.16") testsuite_run_time = time.asctime(time.localtime(time.time())) logger.info("Testsuite start time: {}".format(testsuite_run_time)) diff --git a/tests/topotests/bgp_prefix_list_topo1/test_prefix_lists.py b/tests/topotests/bgp_prefix_list_topo1/test_prefix_lists.py index 2dc95cee21..5131a89ce8 100644 --- a/tests/topotests/bgp_prefix_list_topo1/test_prefix_lists.py +++ b/tests/topotests/bgp_prefix_list_topo1/test_prefix_lists.py @@ -346,9 +346,12 @@ def test_ip_prefix_lists_out_permit(request): result = verify_rib( tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n Error: Routes still" " present in RIB".format(tc_name) + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) + ) + write_test_footer(tc_name) @@ -444,9 +447,11 @@ def test_ip_prefix_lists_in_deny_and_permit_any(request): result = verify_rib( tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n Error: Routes still" " present in RIB".format(tc_name) + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) + ) write_test_footer(tc_name) @@ -644,9 +649,12 @@ def test_ip_prefix_lists_out_deny_and_permit_any(request): result = verify_rib( tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n Error: Routes still" " present in RIB".format(tc_name) + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) + ) + write_test_footer(tc_name) @@ -778,9 +786,11 @@ def test_modify_prefix_lists_in_permit_to_deny(request): result = verify_rib( tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n Error: Routes still" " present in RIB".format(tc_name) + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) + ) write_test_footer(tc_name) @@ -882,9 +892,11 @@ def test_modify_prefix_lists_in_deny_to_permit(request): result = verify_rib( tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n Error: Routes still" " present in RIB".format(tc_name) + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) + ) # Modify ip prefix list input_dict_1 = { @@ -1051,9 +1063,11 @@ def test_modify_prefix_lists_out_permit_to_deny(request): result = verify_rib( tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n Error: Routes still" " present in RIB".format(tc_name) + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) + ) write_test_footer(tc_name) @@ -1157,9 +1171,11 @@ def test_modify_prefix_lists_out_deny_to_permit(request): result = verify_rib( tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n Error: Routes still" " present in RIB".format(tc_name) + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) + ) # Modify ip prefix list input_dict_1 = { @@ -1324,9 +1340,11 @@ def test_ip_prefix_lists_implicit_deny(request): result = verify_rib( tgen, "ipv4", dut, input_dict_1, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n Error: Routes still" " present in RIB".format(tc_name) + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) + ) write_test_footer(tc_name) diff --git a/tests/topotests/bgp_route_map/test_route_map_topo1.py b/tests/topotests/bgp_route_map/test_route_map_topo1.py index 655a3dc899..77bddbe337 100644 --- a/tests/topotests/bgp_route_map/test_route_map_topo1.py +++ b/tests/topotests/bgp_route_map/test_route_map_topo1.py @@ -444,12 +444,11 @@ def test_route_map_inbound_outbound_same_neighbor_p0(request): result = verify_rib( tgen, adt, dut, input_dict_2, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \nroutes are not present in rib \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} BGP RIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) # Verifying RIB routes dut = "r4" @@ -467,12 +466,11 @@ def test_route_map_inbound_outbound_same_neighbor_p0(request): result = verify_rib( tgen, adt, dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \nroutes are not present in rib \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) write_test_footer(tc_name) @@ -666,12 +664,11 @@ def test_route_map_with_action_values_combination_of_prefix_action_p0( result = verify_rib( tgen, adt, dut, input_dict_2, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \nRoutes are still present \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) else: result = verify_rib(tgen, adt, dut, input_dict_2, protocol=protocol) assert result is True, "Testcase {} : Failed \n Error: {}".format( diff --git a/tests/topotests/bgp_route_map/test_route_map_topo2.py b/tests/topotests/bgp_route_map/test_route_map_topo2.py index 4da7eeb2ff..589482d6a5 100644 --- a/tests/topotests/bgp_route_map/test_route_map_topo2.py +++ b/tests/topotests/bgp_route_map/test_route_map_topo2.py @@ -1022,12 +1022,11 @@ def test_modify_prefix_list_referenced_by_rmap_p0(): result = verify_rib( tgen, addr_type, dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \nroutes are not present \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) # Verifying RIB routes dut = "r4" @@ -1036,10 +1035,10 @@ def test_modify_prefix_list_referenced_by_rmap_p0(): result = verify_rib( tgen, addr_type, dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \nExpected behaviour: routes are not present \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) write_test_footer(tc_name) @@ -1293,12 +1292,11 @@ def test_remove_prefix_list_referenced_by_rmap_p0(): result = verify_rib( tgen, addr_type, dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \nroutes are not present \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) # Verifying RIB routes dut = "r4" @@ -1307,12 +1305,11 @@ def test_remove_prefix_list_referenced_by_rmap_p0(): result = verify_rib( tgen, addr_type, dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \nroutes are not present \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) write_test_footer(tc_name) @@ -2139,12 +2136,11 @@ def test_add_remove_rmap_to_specific_neighbor_p0(): result = verify_rib( tgen, addr_type, dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \n Error Routes are still present: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) # Remove applied rmap from neighbor input_dict_4 = { @@ -2553,12 +2549,11 @@ def test_rmap_without_match_and_set_clause_p0(): result = verify_rib( tgen, addr_type, dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \nroutes are not present \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) write_test_footer(tc_name) # Uncomment next line for debugging @@ -2801,12 +2796,11 @@ def test_set_localpref_weight_to_ebgp_and_med_to_ibgp_peers_p0(): input_dict_3_addr_type[addr_type], expected=False, ) - assert ( - result is not True - ), "Testcase {} : Failed \nAttributes are not set \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: BGP attributes should not be set in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) # Verifying RIB routes dut = "r5" @@ -2835,12 +2829,11 @@ def test_set_localpref_weight_to_ebgp_and_med_to_ibgp_peers_p0(): input_dict_3_addr_type[addr_type], expected=False, ) - assert ( - result is not True - ), "Testcase {} : Failed \nAttributes are not set \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: BGP attributes should not be set in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) write_test_footer(tc_name) @@ -3644,12 +3637,11 @@ def test_create_rmap_match_prefix_list_to_deny_in_and_outbound_prefixes_p0(): result = verify_rib( tgen, addr_type, dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \nroutes are not present \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) # Verifying RIB routes dut = "r4" @@ -3658,12 +3650,11 @@ def test_create_rmap_match_prefix_list_to_deny_in_and_outbound_prefixes_p0(): result = verify_rib( tgen, addr_type, dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \nroutes are not present \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) write_test_footer(tc_name) @@ -3963,12 +3954,11 @@ def test_create_rmap_to_match_tag_deny_outbound_prefixes_p0(): result = verify_rib( tgen, addr_type, dut, input_dict, protocol=protocol, expected=False ) - assert ( - result is not True - ), "Testcase {} : Failed \nroutes are denied \n Error: {}".format( - tc_name, result + assert result is not True, ( + "Testcase {} : Failed \n " + "Expected: Routes should not be present in {} FIB \n " + "Found: {}".format(tc_name, dut, result) ) - logger.info("Expected behaviour: {}".format(result)) write_test_footer(tc_name) diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf index 8defa0125a..8ccf7a2a34 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf @@ -27,7 +27,7 @@ segment-routing srv6 locators locator loc1 - prefix 2001:db8:1:1::/64 + prefix 2001:db8:1:1::/64 func-bits 8 ! ! ! diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf index 51d9c92235..839454d8a8 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf @@ -27,7 +27,7 @@ segment-routing srv6 locators locator loc1 - prefix 2001:db8:2:2::/64 + prefix 2001:db8:2:2::/64 func-bits 8 ! ! ! diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/zebra.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/zebra.conf index a43cec20ef..a9319a6aed 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/zebra.conf +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r1/zebra.conf @@ -28,7 +28,7 @@ segment-routing srv6 locators locator loc1 - prefix 2001:db8:1:1::/64 + prefix 2001:db8:1:1::/64 func-bits 8 ! ! ! diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/zebra.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/zebra.conf index 71ddedf6ff..9e5fa0ac07 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/zebra.conf +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf2/r2/zebra.conf @@ -27,7 +27,7 @@ segment-routing srv6 locators locator loc1 - prefix 2001:db8:2:2::/64 + prefix 2001:db8:2:2::/64 func-bits 8 ! ! ! |