update skip conditions for watermark cases #15352

zhixzhu · 2024-11-05T00:25:04Z

Description of PR

Updated skip conditions of watermark cases.

QSharedWatermark: Queue watermark read on egress, since qos params are based on src, keep skipping lossless if src and dst's port_speed_cable_length different, or asic types(Q200, Q100) are different.

PgSharedWatermark: Unskip lossless multi_dut.

BufferPoolWatermark: The watermark is read on egress asic. Unskip lossy for multi_dut. Unskip lossless for multi_dut_shortlink_to_shortlink. Since qos params are based on src, keep skipping lossless if src and dst's port_speed_cable_length different, or asic types(Q200, Q100) are different.

Summary:
Fixes # (issue)
https://migsonic.atlassian.net/browse/MIGSMSFT-695 QoS SAI test gap review

Type of change

Bug fix
Testbed and Framework(new/improvement)
Test case(new/improvement)

Back port request

Approach

What is the motivation for this PR?

update skip conditions for QSharedWatermark and PgSharedWatermark.

How did you do it?

How did you verify/test it?

Verified it on T2 testbed.

QSharedWatermark:
multi-dut short_to_short is also enabled, since ingress and egress port same config. Verification pending.

------------------------------ generated xml file: /tmp/qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark_2024-11-08-21-50-32.xml ------------------------------
INFO:root:Can not get Allure report URL. Please check logs
------------------------------------------------------------------------- live log sessionfinish -------------------------------------------------------------------------
22:36:22 __init__.pytest_terminal_summary         L0067 INFO   | Can not get Allure report URL. Please check logs
======================================================================== short test summary info =========================================================================
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[single_asic-wm_q_shared_lossless]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[single_asic-wm_q_shared_lossy]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[single_dut_multi_asic-wm_q_shared_lossless]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[single_dut_multi_asic-wm_q_shared_lossy]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[multi_dut_longlink_to_shortlink-wm_q_shared_lossy]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiQSharedWatermark[multi_dut_shortlink_to_longlink-wm_q_shared_lossy]
SKIPPED [2] qos/test_qos_sai.py:1830: Skip queue watermark lossless test since portspeed or cable length is different between src and dst asic
SKIPPED [2] qos/test_qos_sai.py:1800: Don't have 2 shortlink frontend nodes - so can't run multi_dut_shortlink_to_shortlinktests
========================================================== 6 passed, 4 skipped, 1 warning in 2748.05s (0:45:48) ==========================================================
sonic@sonic-ucs-m6-09:/data/tests$

PgSharedWatermark multi_dut:

----------------------------- generated xml file: /tmp/qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark_2024-11-08-20-50-54.xml ------------------------------
INFO:root:Can not get Allure report URL. Please check logs
------------------------------------------------------------------------- live log sessionfinish -------------------------------------------------------------------------
21:32:17 __init__.pytest_terminal_summary         L0067 INFO   | Can not get Allure report URL. Please check logs
======================================================================== short test summary info =========================================================================
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[single_asic-wm_pg_shared_lossless]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[single_asic-wm_pg_shared_lossy]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[single_dut_multi_asic-wm_pg_shared_lossless]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[multi_dut_longlink_to_shortlink-wm_pg_shared_lossless]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[multi_dut_shortlink_to_longlink-wm_pg_shared_lossless]
SKIPPED [3] qos/test_qos_sai.py:1642: PGSharedWatermark: Lossy test is not applicable in cisco-8000 multi_asic scenarios.
SKIPPED [2] qos/test_qos_sai.py:1598: Don't have 2 shortlink frontend nodes - so can't run multi_dut_shortlink_to_shortlinktests
========================================================== 5 passed, 5 skipped, 1 warning in 2482.17s (0:41:22) ==========================================================
sonic@sonic-ucs-m6-09:/data/tests$

----------------------------- generated xml file: /tmp/qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark_2024-11-05-00-51-43.xml ------------------------------
------------------------------------------------------------------------- live log sessionfinish -------------------------------------------------------------------------
01:09:16 __init__.pytest_terminal_summary         L0067 INFO   | Can not get Allure report URL. Please check logs
======================================================================== short test summary info =========================================================================
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[multi_dut_shortlink_to_shortlink-wm_pg_shared_lossless]
SKIPPED [1] qos/test_qos_sai.py:1617: The lossy test is not valid for multiAsic configuration.
========================================================== 1 passed, 1 skipped, 1 warning in 1051.75s (0:17:31) ==========================================================
DEBUG:tests.conftest:[log_custom_msg] item: <Function testQosSaiPgSharedWatermark[multi_dut_shortlink_to_shortlink-wm_pg_shared_lossy]>
DEBUG:tests.conftest:append custom_msg: {'dut_check_result': {'config_db_check_pass': False, 'core_dump_check_pass': True}}
INFO:root:Can not get Allure report URL. Please check logs
sonic@sonic-ucs-m6-4:/data/tests$

BufferPoolWatermark:

----------- generated xml file: /tmp/qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark_2024-11-05-05-56-41.xml -----------
------------------------------------------------------- live log sessionfinish --------------------------------------------------------
06:23:48 __init__.pytest_terminal_summary         L0067 INFO   | Can not get Allure report URL. Please check logs
======================================================= short test summary info =======================================================
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[multi_dut_shortlink_to_shortlink-wm_buf_pool_lossless]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[multi_dut_shortlink_to_shortlink-wm_buf_pool_lossy]

---------------------------- generated xml file: /tmp/qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark_2024-11-08-19-14-59.xml -----------------------------
INFO:root:Can not get Allure report URL. Please check logs
------------------------------------------------------------------------- live log sessionfinish -------------------------------------------------------------------------
19:57:05 __init__.pytest_terminal_summary         L0067 INFO   | Can not get Allure report URL. Please check logs
======================================================================== short test summary info =========================================================================
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[single_asic-wm_buf_pool_lossless]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[single_asic-wm_buf_pool_lossy]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[single_dut_multi_asic-wm_buf_pool_lossless]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[single_dut_multi_asic-wm_buf_pool_lossy]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[multi_dut_longlink_to_shortlink-wm_buf_pool_lossy]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark[multi_dut_shortlink_to_longlink-wm_buf_pool_lossy]
SKIPPED [2] qos/test_qos_sai.py:1108: Skip buffer Pool watermark lossless test since portspeed or cable length is different between src and dst asic
SKIPPED [2] qos/test_qos_sai.py:1070: Don't have 2 shortlink frontend nodes - so can't run multi_dut_shortlink_to_shortlinktests
========================================================== 6 passed, 4 skipped, 1 warning in 2524.20s (0:42:04) ==========================================================
sonic@sonic-ucs-m6-09:/data/tests$

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

Signed-off-by: Zhixin Zhu <[email protected]>

alpeshspatel · 2024-11-13T17:53:33Z

FYI @kevinwangsk and @wsycqyz

auspham · 2024-11-14T23:30:01Z

@abdosi please help review

sdszhang · 2024-12-09T00:22:45Z

@zhixzhu can you resolve the conflict, and move it out of draft state when ready?

Signed-off-by: Zhixin Zhu <[email protected]>

zhixzhu · 2024-12-09T17:34:19Z

Conflict resolved, ready for review.

sdszhang

LGTM

mssonicbld · 2024-12-13T01:30:52Z

@zhixzhu PR conflicts with 202405 branch

zhixzhu · 2024-12-13T01:47:20Z

Double commit to 202405: #16056

sdszhang · 2024-12-13T01:59:17Z

cherry pick conflicts due to #14469 not in 202405.

Description of PR Summary: Fixes # (issue) Double commit #15352 Type of change Bug fix Testbed and Framework(new/improvement) Test case(new/improvement) Signed-off-by: Zhixin Zhu <[email protected]>

Updated skip conditions of watermark cases. QSharedWatermark: Queue watermark read on egress, since qos params are based on src, keep skipping lossless if src and dst's port_speed_cable_length different, or asic types(Q200, Q100) are different. PgSharedWatermark: Unskip lossless multi_dut. BufferPoolWatermark: The watermark is read on egress asic. Unskip lossy for multi_dut. Unskip lossless for multi_dut_shortlink_to_shortlink. Since qos params are based on src, keep skipping lossless if src and dst's port_speed_cable_length different, or asic types(Q200, Q100) are different.

mssonicbld · 2025-01-02T09:36:49Z

Cherry-pick PR to 202411: #16297

Updated skip conditions of watermark cases. QSharedWatermark: Queue watermark read on egress, since qos params are based on src, keep skipping lossless if src and dst's port_speed_cable_length different, or asic types(Q200, Q100) are different. PgSharedWatermark: Unskip lossless multi_dut. BufferPoolWatermark: The watermark is read on egress asic. Unskip lossy for multi_dut. Unskip lossless for multi_dut_shortlink_to_shortlink. Since qos params are based on src, keep skipping lossless if src and dst's port_speed_cable_length different, or asic types(Q200, Q100) are different.

update skip conditions for QSharedWatermark and PgSharedWatermark

0bb1d56

Signed-off-by: Zhixin Zhu <[email protected]>

zhixzhu changed the title ~~update skip conditions for QSharedWatermark and PgSharedWatermark~~ update skip conditions for watermark cases Nov 6, 2024

enable multi_dut test for QSharedWatermark and BufferPoolWatermark

59b744f

Signed-off-by: Zhixin Zhu <[email protected]>

zhixzhu force-pushed the qos_sai_skip_update branch from dde5932 to 59b744f Compare November 8, 2024 23:11

sdszhang added the Request for 202405 branch label Dec 9, 2024

merge master

8be7e91

Signed-off-by: Zhixin Zhu <[email protected]>

zhixzhu marked this pull request as ready for review December 9, 2024 17:33

sdszhang approved these changes Dec 12, 2024

View reviewed changes

abdosi approved these changes Dec 12, 2024

View reviewed changes

abdosi merged commit 45b347c into sonic-net:master Dec 12, 2024
16 checks passed

yejianquan added the Approved for 202405 branch label Dec 13, 2024

mssonicbld added the Cherry Pick Conflict_202405 label Dec 13, 2024

zhixzhu mentioned this pull request Dec 13, 2024

[202405] Update skip conditions for watermark cases #16056

Merged

8 tasks

zhixzhu deleted the qos_sai_skip_update branch December 13, 2024 01:47

rlhui added chassis Request for 202411 branch labels Dec 14, 2024

rlhui assigned zhixzhu Dec 14, 2024

rlhui added the Included in 202405 branch label Dec 14, 2024

sdszhang added the Approved for 202411 branch label Jan 2, 2025

mssonicbld added the Created PR to 202411 branch label Jan 2, 2025

mssonicbld mentioned this pull request Jan 2, 2025

[action] [PR:15352] update skip conditions for watermark cases #16297

Merged

8 tasks

mssonicbld added Included in 202411 branch and removed Created PR to 202411 branch labels Jan 3, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update skip conditions for watermark cases #15352

update skip conditions for watermark cases #15352

zhixzhu commented Nov 5, 2024 •

edited

Loading

alpeshspatel commented Nov 13, 2024

auspham commented Nov 14, 2024

sdszhang commented Dec 9, 2024

zhixzhu commented Dec 9, 2024

sdszhang left a comment

mssonicbld commented Dec 13, 2024

zhixzhu commented Dec 13, 2024

sdszhang commented Dec 13, 2024 •

edited

Loading

mssonicbld commented Jan 2, 2025

update skip conditions for watermark cases #15352

update skip conditions for watermark cases #15352

Conversation

zhixzhu commented Nov 5, 2024 • edited Loading

Description of PR

Type of change

Back port request

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

alpeshspatel commented Nov 13, 2024

auspham commented Nov 14, 2024

sdszhang commented Dec 9, 2024

zhixzhu commented Dec 9, 2024

sdszhang left a comment

Choose a reason for hiding this comment

mssonicbld commented Dec 13, 2024

zhixzhu commented Dec 13, 2024

sdszhang commented Dec 13, 2024 • edited Loading

mssonicbld commented Jan 2, 2025

zhixzhu commented Nov 5, 2024 •

edited

Loading

sdszhang commented Dec 13, 2024 •

edited

Loading