Change the losslessvoq ports to use the ones coming from qos-sai-base.#11384
Merged
StormLiangMS merged 1 commit intosonic-net:masterfrom Feb 5, 2024
Merged
Conversation
Contributor
Author
|
@XuChen-MSFT : for viz. |
Contributor
Author
|
@XuChen-MSFT : I heard you had another issue with this PR. May I know what the issue is ? |
XuChen-MSFT
approved these changes
Feb 5, 2024
Contributor
XuChen-MSFT
left a comment
There was a problem hiding this comment.
LGTM, and pass local test on multiple platform
mssonicbld
pushed a commit
to mssonicbld/sonic-mgmt
that referenced
this pull request
Feb 5, 2024
sonic-net#11384) What is the motivation for this PR? To fix the failure of losslessvoq in O8C48 platform. How did you do it? Changed the test to use the ports from the base code. How did you verify/test it? Ran it on my O8C48 Testbed: =============================================================================================== PASSES =============================================================================================== ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_1] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_2] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_3] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_4] ____________________________________________________________________ ------------------------------- generated xml file: /run_logs/8030/2024-01-24-19-49-44/qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq_2024-01-24-19-49-44.xml -------------------------------- INFO:root:Can not get Allure report URL. Please check logs --------------------------------------------------------------------------------------- live log sessionfinish --------------------------------------------------------------------------------------- 19:55:07 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::testQosSaiLosslessVoq[single_asic-lossless_voq_1] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_2] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_3] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_4] SKIPPED [4] qos/qos_sai_base.py:602: Did not find any frontend node that is multi-asic - so can't run single_dut_multi_asic tests SKIPPED [4] qos/qos_sai_base.py:609: multi-dut is not supported on T1 topologies ======================================================================= 4 passed, 8 skipped, 10 warnings in 320.93s (0:05:20) ======================================================================== AzDevOps@sonic-ucs-m3-4:/data/tests$ Any platform specific information? The change is needed for O8C48, but it doesn't affect others.
Collaborator
|
Cherry-pick PR to 202305: #11605 |
mssonicbld
pushed a commit
to mssonicbld/sonic-mgmt
that referenced
this pull request
Feb 5, 2024
sonic-net#11384) What is the motivation for this PR? To fix the failure of losslessvoq in O8C48 platform. How did you do it? Changed the test to use the ports from the base code. How did you verify/test it? Ran it on my O8C48 Testbed: =============================================================================================== PASSES =============================================================================================== ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_1] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_2] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_3] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_4] ____________________________________________________________________ ------------------------------- generated xml file: /run_logs/8030/2024-01-24-19-49-44/qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq_2024-01-24-19-49-44.xml -------------------------------- INFO:root:Can not get Allure report URL. Please check logs --------------------------------------------------------------------------------------- live log sessionfinish --------------------------------------------------------------------------------------- 19:55:07 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::testQosSaiLosslessVoq[single_asic-lossless_voq_1] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_2] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_3] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_4] SKIPPED [4] qos/qos_sai_base.py:602: Did not find any frontend node that is multi-asic - so can't run single_dut_multi_asic tests SKIPPED [4] qos/qos_sai_base.py:609: multi-dut is not supported on T1 topologies ======================================================================= 4 passed, 8 skipped, 10 warnings in 320.93s (0:05:20) ======================================================================== AzDevOps@sonic-ucs-m3-4:/data/tests$ Any platform specific information? The change is needed for O8C48, but it doesn't affect others.
Merged
8 tasks
Collaborator
|
Cherry-pick PR to 202311: #11606 |
Merged
8 tasks
Collaborator
|
@rraghav-cisco PR conflicts with 202205 branch |
Contributor
Author
|
@mssonicbld : 202205 PR: #11617 |
mssonicbld
pushed a commit
that referenced
this pull request
Feb 5, 2024
#11384) What is the motivation for this PR? To fix the failure of losslessvoq in O8C48 platform. How did you do it? Changed the test to use the ports from the base code. How did you verify/test it? Ran it on my O8C48 Testbed: =============================================================================================== PASSES =============================================================================================== ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_1] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_2] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_3] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_4] ____________________________________________________________________ ------------------------------- generated xml file: /run_logs/8030/2024-01-24-19-49-44/qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq_2024-01-24-19-49-44.xml -------------------------------- INFO:root:Can not get Allure report URL. Please check logs --------------------------------------------------------------------------------------- live log sessionfinish --------------------------------------------------------------------------------------- 19:55:07 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::testQosSaiLosslessVoq[single_asic-lossless_voq_1] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_2] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_3] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_4] SKIPPED [4] qos/qos_sai_base.py:602: Did not find any frontend node that is multi-asic - so can't run single_dut_multi_asic tests SKIPPED [4] qos/qos_sai_base.py:609: multi-dut is not supported on T1 topologies ======================================================================= 4 passed, 8 skipped, 10 warnings in 320.93s (0:05:20) ======================================================================== AzDevOps@sonic-ucs-m3-4:/data/tests$ Any platform specific information? The change is needed for O8C48, but it doesn't affect others.
mssonicbld
pushed a commit
that referenced
this pull request
Feb 6, 2024
#11384) What is the motivation for this PR? To fix the failure of losslessvoq in O8C48 platform. How did you do it? Changed the test to use the ports from the base code. How did you verify/test it? Ran it on my O8C48 Testbed: =============================================================================================== PASSES =============================================================================================== ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_1] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_2] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_3] ____________________________________________________________________ ____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_4] ____________________________________________________________________ ------------------------------- generated xml file: /run_logs/8030/2024-01-24-19-49-44/qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq_2024-01-24-19-49-44.xml -------------------------------- INFO:root:Can not get Allure report URL. Please check logs --------------------------------------------------------------------------------------- live log sessionfinish --------------------------------------------------------------------------------------- 19:55:07 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::testQosSaiLosslessVoq[single_asic-lossless_voq_1] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_2] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_3] PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_4] SKIPPED [4] qos/qos_sai_base.py:602: Did not find any frontend node that is multi-asic - so can't run single_dut_multi_asic tests SKIPPED [4] qos/qos_sai_base.py:609: multi-dut is not supported on T1 topologies ======================================================================= 4 passed, 8 skipped, 10 warnings in 320.93s (0:05:20) ======================================================================== AzDevOps@sonic-ucs-m3-4:/data/tests$ Any platform specific information? The change is needed for O8C48, but it doesn't affect others.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of PR
The testcase: qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq uses an internal logic to find the required src and dst ports. This conflicts with the qos-sai-base.py, which returns a correctly calculated set of ports. This causes the test to fail in the case of O8C48, which contains 2 different set of ports with different port-speeds. This PR adjusts that test to use the ports from the qos-sai-base itself.
Type of change
Back port request
Approach
What is the motivation for this PR?
To fix the failure of losslessvoq in O8C48 platform.
How did you do it?
Changed the test to use the ports from the base code.
How did you verify/test it?
Ran it on my O8C48 Testbed:
=============================================================================================== PASSES ===============================================================================================
____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_1] ____________________________________________________________________
____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_2] ____________________________________________________________________
____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_3] ____________________________________________________________________
____________________________________________________________________ TestQosSai.testQosSaiLosslessVoq[single_asic-lossless_voq_4] ____________________________________________________________________
------------------------------- generated xml file: /run_logs/8030/2024-01-24-19-49-44/qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq_2024-01-24-19-49-44.xml --------------------------------
INFO:root:Can not get Allure report URL. Please check logs
--------------------------------------------------------------------------------------- live log sessionfinish ---------------------------------------------------------------------------------------
19:55:07 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::testQosSaiLosslessVoq[single_asic-lossless_voq_1]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_2]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_3]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq[single_asic-lossless_voq_4]
SKIPPED [4] qos/qos_sai_base.py:602: Did not find any frontend node that is multi-asic - so can't run single_dut_multi_asic tests
SKIPPED [4] qos/qos_sai_base.py:609: multi-dut is not supported on T1 topologies
======================================================================= 4 passed, 8 skipped, 10 warnings in 320.93s (0:05:20) ========================================================================
AzDevOps@sonic-ucs-m3-4:/data/tests$
Any platform specific information?
The change is needed for O8C48, but it doesn't affect others.