proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 03:27:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6870 from donaldsharp/test_fixups

Browse Source 
Test fixups
This commit is contained in:
Mark Stapp 2020-08-11 12:40:52 -04:00 committed by GitHub
commit ceb71630ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/topotests/evpn_type5_test_topo1/test_evpn_type5_topo1.py
View File

@ -250,8 +250,8 @@ def prerequisite_config_for_test_suite(tgen):
} }
result = configure_vxlan(tgen, vxlan_input) result = configure_vxlan(tgen, vxlan_input)
assert result is True, "Testcase {} :Failed \n Error: {}".format( assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
tc_name, result tc_name, dut, result
) )
step("Configure bridge interface") step("Configure bridge interface")
@ -268,8 +268,8 @@ def prerequisite_config_for_test_suite(tgen):
} }
} }
result = configure_brctl(tgen, topo, brctl_input) result = configure_brctl(tgen, topo, brctl_input)
assert result is True, "Testcase {} :Failed \n Error: {}".format( assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
tc_name, result tc_name, dut, result
) )
step("Configure default routes") step("Configure default routes")
@ -406,8 +406,8 @@ def test_RD_verification_manual_and_auto_p0(request):
result = verify_attributes_for_evpn_routes( result = verify_attributes_for_evpn_routes(
tgen, topo, dut, input_routes, rd="auto", rd_peer="e1" tgen, topo, dut, input_routes, rd="auto", rd_peer="e1"
) )
assert result is True, "Testcase {} :Failed \n Error: {}".format( assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
tc_name, result tc_name, dut, result
) )
step( step(
@ -437,8 +437,8 @@ def test_RD_verification_manual_and_auto_p0(request):
result = verify_attributes_for_evpn_routes( result = verify_attributes_for_evpn_routes(
tgen, topo, dut, input_routes, rd="50.50.50.50:50" tgen, topo, dut, input_routes, rd="50.50.50.50:50"
) )
assert result is True, "Testcase {} :Failed \n Error: {}".format( assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
tc_name, result tc_name, dut, result
) )
step( step(
@ -472,8 +472,8 @@ def test_RD_verification_manual_and_auto_p0(request):
result = verify_attributes_for_evpn_routes( result = verify_attributes_for_evpn_routes(
tgen, topo, dut, input_routes, rd="100.100.100.100:100" tgen, topo, dut, input_routes, rd="100.100.100.100:100"
) )
assert result is True, "Testcase {} :Failed \n Error: {}".format( assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
tc_name, result tc_name, dut, result
) )
step( step(
@ -672,8 +672,8 @@ def test_RT_verification_manual_p0(request):
result = verify_attributes_for_evpn_routes( result = verify_attributes_for_evpn_routes(
tgen, topo, dut, input_routes, rt="100:100" tgen, topo, dut, input_routes, rt="100:100"
) )
assert result is True, "Testcase {} :Failed \n Error: {}".format( assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
tc_name, result tc_name, dut, result
) )
step( step(
@ -711,8 +711,8 @@ def test_RT_verification_manual_p0(request):
result = verify_attributes_for_evpn_routes( result = verify_attributes_for_evpn_routes(
tgen, topo, dut, input_routes, rt=["100:100", "500:500"] tgen, topo, dut, input_routes, rt=["100:100", "500:500"]
) )
assert result is True, "Testcase {} :Failed \n Error: {}".format( assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
tc_name, result tc_name, dut, result
) )
step( step(
@ -834,8 +834,8 @@ def test_RT_verification_manual_p0(request):
result = verify_attributes_for_evpn_routes( result = verify_attributes_for_evpn_routes(
tgen, topo, dut, input_routes, rt=["100:100", "500:500"] tgen, topo, dut, input_routes, rt=["100:100", "500:500"]
) )
assert result is True, "Testcase {} :Failed \n Error: {}".format( assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
tc_name, result tc_name, dut, result
) )
step("Delete RT export value 100:100 for vrf RED on Edge-1") step("Delete RT export value 100:100 for vrf RED on Edge-1")
@ -1277,14 +1277,14 @@ def test_evpn_routes_from_VNFs_p1(request):
for dut in ["d1", "d2"]: for dut in ["d1", "d2"]:
input_routes = {key: topo["routers"][key] for key in ["r1"]} input_routes = {key: topo["routers"][key] for key in ["r1"]}
result = verify_evpn_routes(tgen, topo, dut, input_routes) result = verify_evpn_routes(tgen, topo, dut, input_routes)
assert result is True, "Testcase {} :Failed \n Error: {}".format( assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
tc_name, result tc_name, dut, result
) )
input_routes = {key: topo["routers"][key] for key in ["r2"]} input_routes = {key: topo["routers"][key] for key in ["r2"]}
result = verify_evpn_routes(tgen, topo, dut, input_routes) result = verify_evpn_routes(tgen, topo, dut, input_routes)
assert result is True, "Testcase {} :Failed \n Error: {}".format( assert result is True, "Testcase {} on {} :Failed \n Error: {}".format(
tc_name, result tc_name, dut, result
) )
step( step(
@ -1861,7 +1861,7 @@ def test_bgp_attributes_for_evpn_address_family_p1(request, attribute):
temp[dut]["bgp"].append({"local_as": as_num, "delete": True}) temp[dut]["bgp"].append({"local_as": as_num, "delete": True})
result = create_router_bgp(tgen, topo, input_dict_2) result = create_router_bgp(tgen, topo, input_dict_2)
assert result is True, "Testcase {} :Failed \n Error: {}".format( assert result is True, "Testcase {} on d1 :Failed \n Error: {}".format(
tc_name, result tc_name, result
) )

2
tests/topotests/lib/common_config.py
View File

@ -2281,7 +2281,7 @@ def configure_vxlan(tgen, input_dict):
cmd = "{} local {}".format(cmd, local_addr) cmd = "{} local {}".format(cmd, local_addr)
if learning == "no": if learning == "no":
cmd = "{} {} learning".format(cmd, learning) cmd = "{} nolearning".format(cmd)
elif learning == "yes": elif learning == "yes":
cmd = "{} learning".format(cmd) cmd = "{} learning".format(cmd)

2
zebra/zebra_vty.c
View File

@ -2441,7 +2441,7 @@ DEFUN (no_vrf_vni_mapping,
int filter = 0; int filter = 0;
ZEBRA_DECLVAR_CONTEXT(vrf, zvrf); ZEBRA_DECLVAR_CONTEXT(vrf, zvrf);
vni_t vni = strtoul(argv[1]->arg, NULL, 10); vni_t vni = strtoul(argv[2]->arg, NULL, 10);
assert(vrf); assert(vrf);
assert(zvrf); assert(zvrf);