Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions tests/fib/test_fib.py
Original file line number Diff line number Diff line change
Expand Up @@ -495,10 +495,11 @@ def test_vxlan_hash(add_default_route_to_dut, duthost, duthosts, fib_info_files_
@pytest.fixture(params=["ipv4-ipv4", "ipv4-ipv6", "ipv6-ipv6", "ipv6-ipv4"])
def nvgre_ipver(request):
return request.param
def test_nvgre_hash(add_default_route_to_dut, duthost, duthosts, fib_info_files_per_function, # noqa F811
hash_keys, ptfhost, nvgre_ipver, tbinfo, mux_server_url, # noqa F811
ignore_ttl, single_fib_for_duts, duts_running_config_facts, # noqa F811
duts_minigraph_facts): # noqa F811
def test_nvgre_hash(add_default_route_to_dut, duthost, duthosts, fib_info_files_per_function, # noqa F811
hash_keys, ptfhost, nvgre_ipver, tbinfo, mux_server_url, # noqa F811
ignore_ttl, single_fib_for_duts, duts_running_config_facts, # noqa F811
setup_active_active_ports, active_active_ports, duts_minigraph_facts, # noqa F811
mux_status_from_nic_simulator): # noqa F811

# For NVGRE, default hash key is inner 5-tuple.
# Due to current limitation, NVGRE hash keys are updated for different vendors.
Expand Down Expand Up @@ -526,8 +527,10 @@ def test_nvgre_hash(add_default_route_to_dut, duthost, duthosts, fib_info_files_
"hash_test.NvgreHashTest",
platform_dir="ptftests",
params={"fib_info_files": fib_info_files_per_function[:3], # Test at most 3 DUTs
"ptf_test_port_map": ptf_test_port_map(ptfhost, tbinfo, duthosts, mux_server_url,
duts_running_config_facts, duts_minigraph_facts),
"ptf_test_port_map": ptf_test_port_map_active_active(
ptfhost, tbinfo, duthosts, mux_server_url,
duts_running_config_facts, duts_minigraph_facts,
mux_status_from_nic_simulator()),
"hash_keys": hash_keys,
"src_ip_range": ",".join(src_ip_range),
"dst_ip_range": ",".join(dst_ip_range),
Expand Down
Loading