Skip to content

Fix QOS tests to run on 64p topo #23325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arista-nwolfe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix QOS tests to run on 64p topo #23325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4019,7 +4019,7 @@ qos/test_qos_sai.py::TestQosSai:
conditions_logical_operator: or
conditions:
- "topo_type in ['m0', 'mx', 'm1']"
- "topo_name not in (constants['QOS_SAI_TOPO'] + ['t2_single_node_max', 't2_single_node_min']) and asic_type not in ['mellanox','marvell-teralynx']"
- "'t2_single_node' not in topo_name and topo_name not in (constants['QOS_SAI_TOPO']) and asic_type not in ['mellanox','marvell-teralynx']"

qos/test_qos_sai.py::TestQosSai::testIPIPQosSaiDscpToPgMapping:
skip:
Expand Down Expand Up @@ -4084,7 +4084,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiDscpQueueMapping:
conditions:
- "'backend' in topo_name"
- "topo_type in ['m0', 'mx', 'm1']"
- "topo_name not in (constants['QOS_SAI_TOPO'] + ['t2_single_node_max', 't2_single_node_min']) and asic_type not in ['mellanox']"
- "'t2_single_node' not in topo_name and topo_name not in (constants['QOS_SAI_TOPO']) and asic_type not in ['mellanox']"

qos/test_qos_sai.py::TestQosSai::testQosSaiDscpToPgMapping:
skip:
Expand All @@ -4093,7 +4093,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiDscpToPgMapping:
conditions:
- "'backend' in topo_name"
- "topo_type in ['m0', 'mx', 'm1']"
- "topo_name not in (constants['QOS_SAI_TOPO'] + ['t2_single_node_max', 't2_single_node_min']) and asic_type not in ['mellanox']"
- "'t2_single_node' not in topo_name and topo_name not in (constants['QOS_SAI_TOPO']) and asic_type not in ['mellanox']"

qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange:
skip:
Expand All @@ -4102,7 +4102,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange:
conditions:
- "asic_type in ['mellanox']"
- "topo_type in ['m0', 'mx', 'm1']"
- "topo_name not in (constants['QOS_SAI_TOPO'] + ['t2_single_node_max', 't2_single_node_min']) and asic_type not in ['mellanox']"
- "'t2_single_node' not in topo_name and topo_name not in (constants['QOS_SAI_TOPO']) and asic_type not in ['mellanox']"

qos/test_qos_sai.py::TestQosSai::testQosSaiFullMeshTrafficSanity:
skip:
Expand All @@ -4121,7 +4121,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolSize:
- "https://github.com/sonic-net/sonic-mgmt/issues/12292 and hwsku in ['Force10-S6100'] and topo_type in ['t1-64-lag']"
- "hwsku not in ['Arista-7060CX-32S-C32', 'Celestica-DX010-C32', 'Arista-7260CX3-D108C8', 'Arista-7260CX3-D108C10', 'Force10-S6100', 'Arista-7260CX3-Q64', 'Arista-7050CX3-32S-C32', 'Arista-7050CX3-32S-C28S4', 'Arista-7050CX3-32S-D48C8', 'Arista-7060CX-32S-D48C8'] and asic_type not in ['mellanox'] and asic_type in ['cisco-8000']"
- "topo_type in ['m0', 'mx', 'm1']"
- "topo_name not in (constants['QOS_SAI_TOPO'] + ['t2_single_node_max', 't2_single_node_min']) and asic_type not in ['mellanox','marvell-teralynx']"
- "'t2_single_node' not in topo_name and topo_name not in (constants['QOS_SAI_TOPO']) and asic_type not in ['mellanox','marvell-teralynx']"
- "asic_type in ['vs']"

qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolWatermark:
Expand Down Expand Up @@ -4183,7 +4183,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiPgHeadroomWatermark:
- "asic_type in ['marvell-teralynx'] and platform in ['x86_64-wistron_6512_32r-r0', 'x86_64-wistron_sw_to3200k-r0']"
- "asic_type in ['cisco-8000'] and not platform.startswith('x86_64-8122_')"
- "topo_type in ['m0', 'mx', 'm1']"
- "topo_name not in (constants['QOS_SAI_TOPO'] + ['t2_single_node_max', 't2_single_node_min']) and asic_type not in ['mellanox']"
- "'t2_single_node' not in topo_name and topo_name not in (constants['QOS_SAI_TOPO']) and asic_type not in ['mellanox']"

qos/test_qos_sai.py::TestQosSai::testQosSaiPgMinThreshold:
skip:
Expand All @@ -4210,7 +4210,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiQWatermarkAllPorts:
conditions:
- "asic_type not in ['cisco-8000']"
- "topo_type in ['m0', 'mx', 'm1']"
- "topo_name not in (constants['QOS_SAI_TOPO'] + ['t2_single_node_max', 't2_single_node_min']) and asic_type not in ['mellanox']"
- "'t2_single_node' not in topo_name and topo_name not in (constants['QOS_SAI_TOPO']) and asic_type not in ['mellanox']"

qos/test_qos_sai.py::TestQosSai::testQosSaiSharedReservationSize:
skip:
Expand Down
2 changes: 2 additions & 0 deletions tests/qos/qos_sai_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,8 @@ def __getEcnWredParam(self, dut_asic, table, port):
if dut_asic.sonichost.is_multi_asic:
port = "{}|{}|{}".format(
dut_asic.sonichost.hostname, dut_asic.namespace, port)
else:
port = "{}|Asic0|{}".format(dut_asic.sonichost.hostname, port)
if check_qos_db_fv_reference_with_table(dut_asic):
out = dut_asic.run_redis_cmd(
argv=[
Expand Down
Loading