update skip condition for cisco T2 by zhixzhu · Pull Request #11553 · sonic-net/sonic-mgmt

zhixzhu · 2024-02-01T23:15:43Z

Description of PR

1, testQosSaiLosslessVoq requires split-voq or fair-voq, skip vanguard(cisco Q200 longlink) since it uses default-voq.
2. testQosSaiSharedReservationSize, skip gibraltar(cisco Q200 linecard) since not enough ports.
Skip shared_res_size_2 for pacific(cisco Q100 linecard) since on pacific, SQG thresholds have no impact on XOFF thresholds.

Summary:
Fixes # (issue)

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?

How did you do it?

How did you verify/test it?

Vanguard:
---------------------------- generated xml file: /tmp/qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq_2024-02-03-00-37-06.xml -----------------------------
INFO:root:Can not get Allure report URL. Please check logs
--------------------------------------------------------------------- live log sessionfinish ---------------------------------------------------------------------
00:40:50 init.pytest_terminal_summary L0064 INFO | Can not get Allure report URL. Please check logs
==================================================================== short test summary info =====================================================================
SKIPPED [1] qos/qos_sai_base.py:2179: This test is skipped for longlink.
=========================================================== 1 skipped, 1 warning in 222.65s (0:03:42) ============================================================

----------------------- generated xml file: /tmp/qos/test_qos_sai.py::TestQosSai::testQosSaiSharedReservationSize_2024-02-03-00-44-40.xml ------------------------
INFO:root:Can not get Allure report URL. Please check logs
--------------------------------------------------------------------- live log sessionfinish ---------------------------------------------------------------------
00:48:24 init.pytest_terminal_summary L0064 INFO | Can not get Allure report URL. Please check logs
==================================================================== short test summary info =====================================================================
SKIPPED [1] qos/test_qos_sai.py:100: This test cannot be run since there are not enough ports. Pls see qos.yaml for the port idx's that are needed.
=========================================================== 1 skipped, 1 warning in 222.69s (0:03:42) ============================================================

Any platform specific information?

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

Documentation

mssonicbld · 2024-02-01T23:16:50Z

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...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/qos/test_qos_sai.py:899:13: E125 continuation line with same indent as next logical line tests/qos/test_qos_sai.py:900:17: E117 over-indented flake8...............................................(no files to check)Skipped check conditional mark sort..........................(no files to check)Skipped

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>

mssonicbld · 2024-02-01T23:24:50Z

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...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/qos/test_qos_sai.py:899:11: E127 continuation line over-indented for visual indent flake8...............................................(no files to check)Skipped check conditional mark sort..........................(no files to check)Skipped

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>

mssonicbld · 2024-02-01T23:29:35Z

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...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/qos/test_qos_sai.py:899:9: E122 continuation line missing indentation or outdented flake8...............................................(no files to check)Skipped check conditional mark sort..........................(no files to check)Skipped

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>

mssonicbld · 2024-02-01T23:36:18Z

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...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Passed flake8...................................................................Failed - hook id: flake8 - exit code: 1 tests/qos/test_qos_sai.py:899:13: E129 visually indented line with same indent as next logical line flake8...............................................(no files to check)Skipped check conditional mark sort..........................(no files to check)Skipped

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>

1, testQosSaiLosslessVoq requires split-voq or fair-voq, skip vanguard(cisco Q200 longlink) since it uses default-voq. 2. testQosSaiSharedReservationSize, skip gibraltar(cisco Q200 linecard) since not enough ports. Skip shared_res_size_2 for pacific(cisco Q100 linecard) since on pacific, SQG thresholds have no impact on XOFF thresholds.

mssonicbld · 2024-02-06T06:47:01Z

Cherry-pick PR to 202305: #11646

1, testQosSaiLosslessVoq requires split-voq or fair-voq, skip vanguard(cisco Q200 longlink) since it uses default-voq. 2. testQosSaiSharedReservationSize, skip gibraltar(cisco Q200 linecard) since not enough ports. Skip shared_res_size_2 for pacific(cisco Q100 linecard) since on pacific, SQG thresholds have no impact on XOFF thresholds.

@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:21Z

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

1, testQosSaiLosslessVoq requires split-voq or fair-voq, skip vanguard(cisco Q200 longlink) since it uses default-voq. 2. testQosSaiSharedReservationSize, skip gibraltar(cisco Q200 linecard) since not enough ports. Skip shared_res_size_2 for pacific(cisco Q100 linecard) since on pacific, SQG thresholds have no impact on XOFF thresholds.

mssonicbld · 2024-03-22T05:57:24Z

Cherry-pick PR to 202311: #12090

1, testQosSaiLosslessVoq requires split-voq or fair-voq, skip vanguard(cisco Q200 longlink) since it uses default-voq. 2. testQosSaiSharedReservationSize, skip gibraltar(cisco Q200 linecard) since not enough ports. Skip shared_res_size_2 for pacific(cisco Q100 linecard) since on pacific, SQG thresholds have no impact on XOFF thresholds.

zhixzhu marked this pull request as draft February 1, 2024 23:15

zhixzhu force-pushed the t2_skip_case_master branch from 41de0ef to 24ad77d Compare February 1, 2024 23:35

update skip condition for cisco T2

e478d46

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

zhixzhu force-pushed the t2_skip_case_master branch from 24ad77d to e478d46 Compare February 1, 2024 23:39

skip longlink instead of skip vanguard

9b481ab

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

zhixzhu marked this pull request as ready for review February 3, 2024 01:02

abdosi approved these changes Feb 6, 2024

View reviewed changes

abdosi merged commit fb92b91 into sonic-net:master Feb 6, 2024

abdosi added Approved for 202305 branch Request for 202305 branch Request for 202311 branch and removed Approved for 202305 branch labels Feb 6, 2024

mssonicbld added the Created PR to 202305 branch label Feb 6, 2024

mssonicbld mentioned this pull request Feb 6, 2024

[action] [PR:11553] update skip condition for cisco T2 #11646

Merged

8 tasks

abdosi added Created PR to 202305 branch and removed Created PR to 202305 branch labels Feb 6, 2024

mssonicbld added Included in 202305 branch and removed Created PR to 202305 branch labels Feb 6, 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

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

Merged

7 tasks

wangxin added the Approved for 202311 branch label Mar 22, 2024

mssonicbld added the Created PR to 202311 branch label Mar 22, 2024

mssonicbld mentioned this pull request Mar 22, 2024

[action] [PR:11553] update skip condition for cisco T2 #12090

Merged

8 tasks

mssonicbld added Included in 202311 branch and removed Created PR to 202311 branch labels Mar 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update skip condition for cisco T2#11553

update skip condition for cisco T2#11553
abdosi merged 2 commits intosonic-net:masterfrom
zhixzhu:t2_skip_case_master

zhixzhu commented Feb 1, 2024 •

edited

Loading

Uh oh!

mssonicbld commented Feb 1, 2024

Uh oh!

mssonicbld commented Feb 1, 2024

Uh oh!

mssonicbld commented Feb 1, 2024

Uh oh!

mssonicbld commented Feb 1, 2024

Uh oh!

mssonicbld commented Feb 6, 2024

Uh oh!

XuChen-MSFT commented Feb 20, 2024

Uh oh!

mssonicbld commented Mar 22, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

zhixzhu commented Feb 1, 2024 • 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 Feb 1, 2024

Uh oh!

mssonicbld commented Feb 1, 2024

Uh oh!

mssonicbld commented Feb 1, 2024

Uh oh!

mssonicbld commented Feb 1, 2024

Uh oh!

mssonicbld commented Feb 6, 2024

Uh oh!

XuChen-MSFT commented Feb 20, 2024

Uh oh!

mssonicbld commented Mar 22, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

zhixzhu commented Feb 1, 2024 •

edited

Loading