Skip to content

Commit 213f520

Browse files
committed
[202411][dualtor-aa][nvgre hash] Add dualtor_aa support to test_nvgre_hash
Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
1 parent bb3e0f9 commit 213f520

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

tests/fib/test_fib.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -495,10 +495,11 @@ def test_vxlan_hash(add_default_route_to_dut, duthost, duthosts, fib_info_files_
495495
@pytest.fixture(params=["ipv4-ipv4", "ipv4-ipv6", "ipv6-ipv6", "ipv6-ipv4"])
496496
def nvgre_ipver(request):
497497
return request.param
498-
def test_nvgre_hash(add_default_route_to_dut, duthost, duthosts, fib_info_files_per_function, # noqa F811
499-
hash_keys, ptfhost, nvgre_ipver, tbinfo, mux_server_url, # noqa F811
500-
ignore_ttl, single_fib_for_duts, duts_running_config_facts, # noqa F811
501-
duts_minigraph_facts): # noqa F811
498+
def test_nvgre_hash(add_default_route_to_dut, duthost, duthosts, fib_info_files_per_function, # noqa F811
499+
hash_keys, ptfhost, nvgre_ipver, tbinfo, mux_server_url, # noqa F811
500+
ignore_ttl, single_fib_for_duts, duts_running_config_facts, # noqa F811
501+
setup_active_active_ports, active_active_ports, duts_minigraph_facts, # noqa F811
502+
mux_status_from_nic_simulator): # noqa F811
502503

503504
# For NVGRE, default hash key is inner 5-tuple.
504505
# Due to current limitation, NVGRE hash keys are updated for different vendors.
@@ -526,8 +527,10 @@ def test_nvgre_hash(add_default_route_to_dut, duthost, duthosts, fib_info_files_
526527
"hash_test.NvgreHashTest",
527528
platform_dir="ptftests",
528529
params={"fib_info_files": fib_info_files_per_function[:3], # Test at most 3 DUTs
529-
"ptf_test_port_map": ptf_test_port_map(ptfhost, tbinfo, duthosts, mux_server_url,
530-
duts_running_config_facts, duts_minigraph_facts),
530+
"ptf_test_port_map": ptf_test_port_map_active_active(
531+
ptfhost, tbinfo, duthosts, mux_server_url,
532+
duts_running_config_facts, duts_minigraph_facts,
533+
mux_status_from_nic_simulator()),
531534
"hash_keys": hash_keys,
532535
"src_ip_range": ",".join(src_ip_range),
533536
"dst_ip_range": ",".join(dst_ip_range),

0 commit comments

Comments
 (0)