Skip to content

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

Closed
mssonicbld wants to merge 1 commit intosonic-net:202311from
mssonicbld:cherry/202311/10838
Closed

[action] [PR:10838] [T2] Add case to test lossy fair-voq#14447
mssonicbld wants to merge 1 commit intosonic-net:202311from
mssonicbld:cherry/202311/10838

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

@mssonicbld mssonicbld commented Sep 6, 2024

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

@zhixzhu @mssonicbld
[T2] Add case to test lossy fair-voq (sonic-net#10838)
f0523e8 
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 mssonicbld mentioned this pull request Sep 6, 2024
Merged
7 tasks
@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 6, 2024

Original PR: #10838

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 6, 2024

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/qos_sai_base.py:2317:5: F811 redefinition of unused 'skip_longlink' from line 2271

flake8...............................................(no files to check)Skipped
check conditional mark sort..............................................Passed

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

  1. 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.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@kevinskwang
Copy link
Copy Markdown
Contributor

kevinskwang commented Sep 6, 2024 •
edited
Loading

@zhixzhu could you check the error?

  • hook id: flake8
  • exit code: 1

tests/qos/qos_sai_base.py:2317:5: F811 redefinition of unused 'skip_longlink' from line 2271

flake8...............................................(no files to check)Skipped
check conditional mark sort..............................................Passed

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 7, 2024

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Sep 7, 2024

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 7, 2024

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/qos_sai_base.py:2317:5: F811 redefinition of unused 'skip_longlink' from line 2271

flake8...............................................(no files to check)Skipped
check conditional mark sort..............................................Passed

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

  1. 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.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 9, 2024

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Sep 9, 2024

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 9, 2024

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/qos_sai_base.py:2317:5: F811 redefinition of unused 'skip_longlink' from line 2271

flake8...............................................(no files to check)Skipped
check conditional mark sort..............................................Passed

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

  1. 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.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@zhixzhu
Copy link
Copy Markdown
Contributor

zhixzhu commented Sep 9, 2024 •
edited
Loading

mssonicbld#1
@XuChen-MSFT This PR is to fix pre-commit failure, I don't have write access of mssonicbld:cherry/202311/10838

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 10, 2024

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Sep 10, 2024

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 10, 2024

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/qos_sai_base.py:2317:5: F811 redefinition of unused 'skip_longlink' from line 2271

flake8...............................................(no files to check)Skipped
check conditional mark sort..............................................Passed

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

  1. 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.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

XuChen-MSFT
XuChen-MSFT approved these changes Sep 11, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@XuChen-MSFT XuChen-MSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cherry-pick PR #10838 to 202311.
it's dependency of PR #13384

XuChen-MSFT
XuChen-MSFT reviewed Sep 12, 2024
View reviewed changes
tests/qos/qos_sai_base.py
return

@pytest.fixture(scope="function", autouse=False)
def skip_longlink(self, dutQosConfig):
Copy link
Copy Markdown
Contributor

@XuChen-MSFT XuChen-MSFT Sep 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zhixzhu
pre-commit check failed, as below:

Pre-commit check results:
flake8...................................................................Failed

  • hook id: flake8
  • exit code: 1

tests/qos/qos_sai_base.py:2317:5: F811 redefinition of unused 'skip_longlink' from line 2271

Copy link
Copy Markdown
Contributor

@zhixzhu zhixzhu Sep 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@XuChen-MSFT This PR mssonicbld#1 is to fix pre-commit failure, I don't have write access of mssonicbld:cherry/202311/10838

Copy link
Copy Markdown
Contributor

@XuChen-MSFT XuChen-MSFT Sep 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @zhixzhu better re-create manually double-commit for #10838, rather than create an additional patch for this automate PR.

Copy link
Copy Markdown
Contributor

@zhixzhu zhixzhu Sep 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR to double commit: #14584

@XuChen-MSFT XuChen-MSFT mentioned this pull request Sep 13, 2024
Open
6 tasks
@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 14, 2024

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Sep 14, 2024

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 14, 2024

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/qos_sai_base.py:2317:5: F811 redefinition of unused 'skip_longlink' from line 2271

flake8...............................................(no files to check)Skipped
check conditional mark sort..............................................Passed

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

  1. 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.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 17, 2024

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Sep 17, 2024

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 17, 2024

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/qos_sai_base.py:2317:5: F811 redefinition of unused 'skip_longlink' from line 2271

flake8...............................................(no files to check)Skipped
check conditional mark sort..............................................Passed

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

  1. 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.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Nov 9, 2024

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Nov 9, 2024

Pull request contains merge conflicts.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Nov 12, 2024

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Nov 12, 2024

Pull request contains merge conflicts.

@zhixzhu
Copy link
Copy Markdown
Contributor

zhixzhu commented Nov 12, 2024 •
edited
Loading

For 202311, manually cherry pick by PR #14584
Please close this PR. @XuChen-MSFT

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Jan 21, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 21, 2025

Pull request contains merge conflicts.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Jan 24, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 24, 2025

Pull request contains merge conflicts.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Jan 25, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 25, 2025

Pull request contains merge conflicts.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Jan 28, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 28, 2025

Pull request contains merge conflicts.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Jan 29, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 29, 2025

Pull request contains merge conflicts.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Jan 30, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 30, 2025

Pull request contains merge conflicts.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Jan 31, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Jan 31, 2025

Pull request contains merge conflicts.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Feb 4, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Feb 4, 2025

Pull request contains merge conflicts.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Feb 8, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Feb 8, 2025

Pull request contains merge conflicts.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Mar 8, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Mar 8, 2025

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Mar 9, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Mar 9, 2025

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Mar 10, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Mar 10, 2025

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 11, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Sep 11, 2025

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

mssonicbld commented Sep 13, 2025

/azp run Azure.sonic-mgmt

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Sep 13, 2025

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

@liushilongbuaa
Copy link
Copy Markdown
Contributor

liushilongbuaa commented Mar 23, 2026

@zhixzhu , PR conflict. Please confirm if it is still needed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zhixzhu zhixzhu zhixzhu left review comments

@XuChen-MSFT XuChen-MSFT XuChen-MSFT approved these changes

Assignees

No one assigned

Labels

automerge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mssonicbld @kevinskwang @zhixzhu @liushilongbuaa @XuChen-MSFT