[T2] Add case to test lossy fair-voq by zhixzhu · Pull Request #10838 · sonic-net/sonic-mgmt

zhixzhu · 2023-11-23T01:27:26Z

Description of PR

1, Add a new case to test lossy fair-voq.
2, Add lossy_queue_voq_2 and lossy_queue_voq_3 to qos_param_generator.py.
Default-voq and fair-voq will pass lossy_queue_voq_2, fair-voq and split-voq will pass lossy_queue_voq_3.

Summary:
Fixes # (issue)

Type of change

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

Back port request

201911
202012
202205
202305

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Case testQosSaiLossyQueueVoqMultiSrc

vanguard(Q200 longlink, default voq) skipped:

-------------------------------------------------- generated xml file: /tmp/qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoqMultiSrc.xml --------------------------------------------------
INFO:root:Can not get Allure report URL. Please check logs
------------------------------------------------------------------------------------- live log sessionfinish --------------------------------------------------------------------------------------
01:57:15 __init__.pytest_terminal_summary         L0064 INFO   | Can not get Allure report URL. Please check logs
===================================================================================== short test summary info =====================================================================================
SKIPPED [1] /data/tests/qos/qos_sai_base.py:2125: This test is skipped for egress asic HBM enabled systems.
=================================================================================== 1 skipped in 355.75 seconds ===================================================================================

lancer(Q200 shortlink, fair voq) passed:

============================================================================================= PASSES ==============================================================================================
_____________________________________________________________________ TestQosSai.testQosSaiLossyQueueVoqMultiSrc[single_asic] _____________________________________________________________________
-------------------------------------------------- generated xml file: /tmp/qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoqMultiSrc.xml --------------------------------------------------
INFO:root:Can not get Allure report URL. Please check logs
------------------------------------------------------------------------------------- live log sessionfinish --------------------------------------------------------------------------------------
00:53:24 __init__.pytest_terminal_summary         L0064 INFO   | Can not get Allure report URL. Please check logs
===================================================================================== short test summary info =====================================================================================
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoqMultiSrc[single_asic]
=================================================================================== 1 passed in 389.64 seconds ====================================================================================

Case testQosSaiLossyQueueVoq

Vanguard skipped lossy_queue_voq_1, passed lossy_queue_voq_2.

============================================================================================= PASSES ==============================================================================================
________________________________________________________________ TestQosSai.testQosSaiLossyQueueVoq[single_asic-lossy_queue_voq_2] ________________________________________________________________
------------------------------------------------------ generated xml file: /tmp/qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoq.xml ------------------------------------------------------
INFO:root:Can not get Allure report URL. Please check logs
------------------------------------------------------------------------------------- live log sessionfinish --------------------------------------------------------------------------------------
01:17:13 __init__.pytest_terminal_summary         L0064 INFO   | Can not get Allure report URL. Please check logs
===================================================================================== short test summary info =====================================================================================
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoq[single_asic-lossy_queue_voq_2]
SKIPPED [1] /data/tests/qos/test_qos_sai.py:1135: LossyQueueVoq: This test is skipped since cisco-8000 T2 doesn't support split-voq.
============================================================================== 1 passed, 1 skipped in 608.24 seconds ==============================================================================

Lancer skipped lossy_queue_voq_1, passed lossy_queue_voq_2.

============================================================================================= PASSES ==============================================================================================
________________________________________________________________ TestQosSai.testQosSaiLossyQueueVoq[single_asic-lossy_queue_voq_2] ________________________________________________________________
------------------------------------------------------ generated xml file: /tmp/qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoq.xml ------------------------------------------------------
INFO:root:Can not get Allure report URL. Please check logs
------------------------------------------------------------------------------------- live log sessionfinish --------------------------------------------------------------------------------------
01:32:15 __init__.pytest_terminal_summary         L0064 INFO   | Can not get Allure report URL. Please check logs
===================================================================================== short test summary info =====================================================================================
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoq[single_asic-lossy_queue_voq_2]
SKIPPED [1] /data/tests/qos/test_qos_sai.py:1135: LossyQueueVoq: This test is skipped since cisco-8000 T2 doesn't support split-voq.
============================================================================== 1 passed, 1 skipped in 615.21 seconds ==============================================================================

Any platform specific information?

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

Documentation

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>

mssonicbld · 2023-11-23T01:28:36Z

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed fix end of files.........................................................Passed check yaml...............................................................Passed check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/qos/test_qos_sai.py:2080:14: E111 indentation is not a multiple of 4 tests/qos/test_qos_sai.py:2080:14: E117 over-indented tests/qos/test_qos_sai.py:2081:18: E128 continuation line under-indented for visual indent tests/saitests/py3/sai_qos_tests.py:5366:1: E302 expected 2 blank lines, found 1 tests/saitests/py3/sai_qos_tests.py:5402:121: E501 line too long (148 > 120 characters) tests/saitests/py3/sai_qos_tests.py:5409:121: E501 line too long (130 > 120 characters) tests/saitests/py3/sai_qos_tests.py:5451:67: E128 continuation line under-indented for visual indent tests/saitests/py3/sai_qos_tests.py:5460:121: E501 line too long (122 > 120 characters) tests/saitests/py3/sai_qos_tests.py:5468:62: E128 continuation line under-indented for visual indent tests/saitests/py3/sai_qos_tests.py:5505:121: E501 line too long (129 > 120 characters) tests/saitests/py3/sai_qos_tests.py:5506:121: E501 line too long (133 > 120 characters) ... [truncated extra lines, please run pre-commit locally to view full check results]

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>

mssonicbld · 2023-11-24T05:45:43Z

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed fix end of files.........................................................Passed check yaml...............................................................Passed check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/saitests/py3/sai_qos_tests.py:5456:67: E128 continuation line under-indented for visual indent tests/saitests/py3/sai_qos_tests.py:5474:62: E128 continuation line under-indented for visual indent flake8...............................................(no files to check)Skipped check conditional mark sort..............................................Failed - hook id: check-conditional-mark-sort - exit code: 1 The entries in tests/common/plugins/conditional_mark/tests_mark_conditions.yaml tests/common/plugins/conditional_mark/tests_mark_conditions_acl.yaml tests/common/plugins/conditional_mark/tests_mark_conditions_drop_packets.yaml tests/common/plugins/conditional_mark/tests_mark_conditions_platform_tests.yaml are not sorted in alphabetic order.

To run the pre-commit checks locally, you can follow below steps:

Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
docker container.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>

abdosi · 2024-02-02T18:31:55Z

Please resolve the conflict.

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>

zhixzhu · 2024-02-03T01:06:53Z

@abdosi conflicts resolved.

@pytest

What is the motivation for this PR? PR #10382 caused below two KeyError: @pytest.fixture(scope="function", autouse=False) def skip_pacific_dst_asic(self, dutConfig): > if dutConfig['dstDutAsic'] == "pac": E KeyError: 'dstDutAsic' if "wm_pg_shared_lossless" in pgProfile: pktsNumFillShared = qosConfig[pgProfile]["pkts_num_trig_pfc"] elif "wm_pg_shared_lossy" in pgProfile: > if dutConfig['dstDutAsic'] == "pac": E KeyError: 'dstDutAsic' and remove duplicated code in PR #11553 and PR #10838, it will cause pre-commit failure @pytest.fixture(scope="function", autouse=False) def skip_longlink(self, dutQosConfig): portSpeedCableLength = dutQosConfig["portSpeedCableLength"] match = re.search("_([0-9]*)m", portSpeedCableLength) if match and int(match.group(1)) > 2000: pytest.skip( "This test is skipped for longlink.") yield return How did you do it? fix keyerror and remove duplicated code

@pytest

What is the motivation for this PR? PR sonic-net#10382 caused below two KeyError: @pytest.fixture(scope="function", autouse=False) def skip_pacific_dst_asic(self, dutConfig): > if dutConfig['dstDutAsic'] == "pac": E KeyError: 'dstDutAsic' if "wm_pg_shared_lossless" in pgProfile: pktsNumFillShared = qosConfig[pgProfile]["pkts_num_trig_pfc"] elif "wm_pg_shared_lossy" in pgProfile: > if dutConfig['dstDutAsic'] == "pac": E KeyError: 'dstDutAsic' and remove duplicated code in PR sonic-net#11553 and PR sonic-net#10838, it will cause pre-commit failure @pytest.fixture(scope="function", autouse=False) def skip_longlink(self, dutQosConfig): portSpeedCableLength = dutQosConfig["portSpeedCableLength"] match = re.search("_([0-9]*)m", portSpeedCableLength) if match and int(match.group(1)) > 2000: pytest.skip( "This test is skipped for longlink.") yield return How did you do it? fix keyerror and remove duplicated code

@pytest

What is the motivation for this PR? PR sonic-net#10382 caused below two KeyError: @pytest.fixture(scope="function", autouse=False) def skip_pacific_dst_asic(self, dutConfig): > if dutConfig['dstDutAsic'] == "pac": E KeyError: 'dstDutAsic' if "wm_pg_shared_lossless" in pgProfile: pktsNumFillShared = qosConfig[pgProfile]["pkts_num_trig_pfc"] elif "wm_pg_shared_lossy" in pgProfile: > if dutConfig['dstDutAsic'] == "pac": E KeyError: 'dstDutAsic' and remove duplicated code in PR sonic-net#11553 and PR sonic-net#10838, it will cause pre-commit failure @pytest.fixture(scope="function", autouse=False) def skip_longlink(self, dutQosConfig): portSpeedCableLength = dutQosConfig["portSpeedCableLength"] match = re.search("_([0-9]*)m", portSpeedCableLength) if match and int(match.group(1)) > 2000: pytest.skip( "This test is skipped for longlink.") yield return How did you do it? fix keyerror and remove duplicated code

@pytest

What is the motivation for this PR? PR #10382 caused below two KeyError: @pytest.fixture(scope="function", autouse=False) def skip_pacific_dst_asic(self, dutConfig): > if dutConfig['dstDutAsic'] == "pac": E KeyError: 'dstDutAsic' if "wm_pg_shared_lossless" in pgProfile: pktsNumFillShared = qosConfig[pgProfile]["pkts_num_trig_pfc"] elif "wm_pg_shared_lossy" in pgProfile: > if dutConfig['dstDutAsic'] == "pac": E KeyError: 'dstDutAsic' and remove duplicated code in PR #11553 and PR #10838, it will cause pre-commit failure @pytest.fixture(scope="function", autouse=False) def skip_longlink(self, dutQosConfig): portSpeedCableLength = dutQosConfig["portSpeedCableLength"] match = re.search("_([0-9]*)m", portSpeedCableLength) if match and int(match.group(1)) > 2000: pytest.skip( "This test is skipped for longlink.") yield return How did you do it? fix keyerror and remove duplicated code

@pytest

What is the motivation for this PR? PR #10382 caused below two KeyError: @pytest.fixture(scope="function", autouse=False) def skip_pacific_dst_asic(self, dutConfig): > if dutConfig['dstDutAsic'] == "pac": E KeyError: 'dstDutAsic' if "wm_pg_shared_lossless" in pgProfile: pktsNumFillShared = qosConfig[pgProfile]["pkts_num_trig_pfc"] elif "wm_pg_shared_lossy" in pgProfile: > if dutConfig['dstDutAsic'] == "pac": E KeyError: 'dstDutAsic' and remove duplicated code in PR #11553 and PR #10838, it will cause pre-commit failure @pytest.fixture(scope="function", autouse=False) def skip_longlink(self, dutQosConfig): portSpeedCableLength = dutQosConfig["portSpeedCableLength"] match = re.search("_([0-9]*)m", portSpeedCableLength) if match and int(match.group(1)) > 2000: pytest.skip( "This test is skipped for longlink.") yield return How did you do it? fix keyerror and remove duplicated code

XuChen-MSFT · 2024-02-20T06:55:31Z

have duplicated impl for function "skip_longlink" in both PR #11553 and PR #10838,
already fixed in master branch, please remove duplicated code when cherry pick

abdosi · 2024-03-01T18:19:06Z

have duplicated impl for function "skip_longlink" in both PR #11553 and PR #10838, already fixed in master branch, please remove duplicated code when cherry pick

@zhixzhu to handle this please create PR for 202305/202311 directly.

zhixzhu · 2024-03-05T19:03:37Z

To avoid duplicate function "skip_longlink", here is the PR for 202305: #11904
Didn't see function "skip_longlink" in 202311 branch.

Double commit #10838 1, Add a new case to test lossy fair-voq. 2, Add lossy_queue_voq_2 and lossy_queue_voq_3 to qos_param_generator.py. Default-voq and fair-voq will pass lossy_queue_voq_2, fair-voq and split-voq will pass lossy_queue_voq_3. Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>

XuChen-MSFT · 2024-09-05T12:57:43Z

@kevinskwang can you help to approve cherry-pick to 202311 branch?

1, Add a new case to test lossy fair-voq. 2, Add lossy_queue_voq_2 and lossy_queue_voq_3 to qos_param_generator.py. Default-voq and fair-voq will pass lossy_queue_voq_2, fair-voq and split-voq will pass lossy_queue_voq_3.

mssonicbld · 2024-09-06T02:13:22Z

Cherry-pick PR to 202311: #14447

mssonicbld · 2024-09-06T02:20:57Z

@zhixzhu PR conflicts with 202405 branch

XuChen-MSFT · 2024-09-13T02:48:31Z

@zhixzhu
can you re-create PR to manually double commit to 202311 branch,
rather than create an additional patch for its automate PR #14447

XuChen-MSFT · 2024-09-26T07:10:41Z

This PR had been included in 202305 and 202405.
For 202311, manually cherry pick by PR #14584

Add case to test lossy fair-voq

d27dc8d

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>

remove lossy_queue_voq_2 from topo-any

dddef6e

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>

zhixzhu marked this pull request as ready for review November 24, 2023 05:45

zhixzhu requested review from XuChen-MSFT and wsycqyz as code owners November 24, 2023 05:45

fix under-indent

01c4be4

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>

zhixzhu mentioned this pull request Dec 15, 2023

add lossy_queue_voq_2 in qos_param_generator.py #10535

Closed

7 tasks

zhixzhu changed the title ~~Add case to test lossy fair-voq~~ [T2] Add case to test lossy fair-voq Jan 19, 2024

abdosi added Request for 202305 branch Request for 202311 branch labels Feb 2, 2024

merge master

59c5aac

Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>

abdosi approved these changes Feb 9, 2024

View reviewed changes

abdosi merged commit a54467c into sonic-net:master Feb 9, 2024

XuChen-MSFT mentioned this pull request Feb 19, 2024

fix keyerror of PR #10382 #11722

Merged

8 tasks

mssonicbld mentioned this pull request Feb 20, 2024

[action] [PR:11722] fix keyerror of PR #10382 #11724

Merged

8 tasks

mssonicbld mentioned this pull request Feb 20, 2024

[action] [PR:11722] fix keyerror of PR #10382 #11725

Merged

8 tasks

XuChen-MSFT mentioned this pull request Feb 20, 2024

update skip condition for cisco T2 #11553

Merged

8 tasks

abdosi removed Request for 202305 branch Request for 202311 branch labels Mar 1, 2024

zhixzhu mentioned this pull request Mar 5, 2024

[202305] [T2] Add case to test lossy fair-voq #11904

Merged

8 tasks

zhixzhu deleted the lossyqueue_fair_voq_master branch March 5, 2024 19:03

XuChen-MSFT mentioned this pull request Aug 16, 2024

Adjust packet size for testQosSaiLossyQueueVoqMultiSrc #13384

Merged

8 tasks

XuChen-MSFT added the Request for 202311 branch label Sep 5, 2024

kevinskwang added the Approved for 202311 branch label Sep 6, 2024

mssonicbld added the Created PR to 202311 branch label Sep 6, 2024

mssonicbld mentioned this pull request Sep 6, 2024

[action] [PR:10838] [T2] Add case to test lossy fair-voq #14447

Closed

7 tasks

kevinskwang added Request for 202405 branch Approved for 202405 branch labels Sep 6, 2024

mssonicbld added the Cherry Pick Conflict_202405 label Sep 6, 2024

zhixzhu mentioned this pull request Sep 13, 2024

[202311] Add case to test lossy fair-voq #14584

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[T2] Add case to test lossy fair-voq#10838

[T2] Add case to test lossy fair-voq#10838
abdosi merged 4 commits intosonic-net:masterfrom
zhixzhu:lossyqueue_fair_voq_master

zhixzhu commented Nov 23, 2023 •

edited

Loading

Uh oh!

mssonicbld commented Nov 23, 2023

Uh oh!

mssonicbld commented Nov 24, 2023

Uh oh!

abdosi commented Feb 2, 2024

Uh oh!

zhixzhu commented Feb 3, 2024

Uh oh!

XuChen-MSFT commented Feb 20, 2024

Uh oh!

abdosi commented Mar 1, 2024 •

edited

Loading

Uh oh!

zhixzhu commented Mar 5, 2024

Uh oh!

XuChen-MSFT commented Sep 5, 2024

Uh oh!

mssonicbld commented Sep 6, 2024

Uh oh!

mssonicbld commented Sep 6, 2024

Uh oh!

XuChen-MSFT commented Sep 13, 2024 •

edited

Loading

Uh oh!

XuChen-MSFT commented Sep 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

zhixzhu commented Nov 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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

Uh oh!

mssonicbld commented Nov 23, 2023

Uh oh!

mssonicbld commented Nov 24, 2023

Uh oh!

abdosi commented Feb 2, 2024

Uh oh!

zhixzhu commented Feb 3, 2024

Uh oh!

XuChen-MSFT commented Feb 20, 2024

Uh oh!

abdosi commented Mar 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zhixzhu commented Mar 5, 2024

Uh oh!

XuChen-MSFT commented Sep 5, 2024

Uh oh!

mssonicbld commented Sep 6, 2024

Uh oh!

mssonicbld commented Sep 6, 2024

Uh oh!

XuChen-MSFT commented Sep 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

XuChen-MSFT commented Sep 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

zhixzhu commented Nov 23, 2023 •

edited

Loading

abdosi commented Mar 1, 2024 •

edited

Loading

XuChen-MSFT commented Sep 13, 2024 •

edited

Loading