[QoS] IP-IP DSCP to Queue Mapping Testgap by developfast · Pull Request #9098 · sonic-net/sonic-mgmt

developfast · 2023-07-24T16:40:00Z

Description of PR

Summary: Currently, the test case testQosSaiDscpQueueMapping only verify the DSCP to Queue mapping for regular traffic. The mapping of IPinIP traffic (decapsulated in IPinIP tunnel) is not tested. Hence a new test case is being added to verify the mapping for IPinIP traffic. This PR adds two tests to test IP-IP packet forwarding in both "uniform" and "pipe" decap mode on the DUT.

Fixes (issue) #8789

Type of change

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

Back port request

201911
202012
202205

Approach

What is the motivation for this PR?

See summary

How did you do it?

Generate IPinIP traffic from ptf using ptfadapter. The destination IP in the outer layer of the packets should be the loopback (10.1.0.32) of DUT.
Ingress the packets to DUT, verify the packets are decapsulated.
Check the queue counter within the DUT, ensure the mapping is as expected.

How did you verify/test it?

Test passes locally in both uniform and pipe mode. Currently, this test logs the mapping of DSCP to Queue value for all ASIC types.

Output:

  Inner Packet DSCP Value    Egress Queue    Egress Queue Count
-------------------------  --------------  --------------------
                        0               1                 10000
                        1               1                 10000
                        2               1                 10000
                        3               3                 10000
                        4               4                 10000
                        5               2                 10000
                        6               1                 10000
                        7               1                 10000
                        8               0                 10000
                        9               1                 10000
                       10               1                 10000
                       11               1                 10000
...

Any platform specific information?

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

Documentation

mssonicbld · 2023-07-24T16:41:03Z

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.................................................Failed - hook id: trailing-whitespace - exit code: 1 - files were modified by this hook Fixing tests/saitests/sai_qos_tests.py fix end of files.........................................................Failed - hook id: end-of-file-fixer - exit code: 1 - files were modified by this hook Fixing tests/saitests/sai_qos_tests.py check yaml...........................................(no files to check)Skipped check for added large files..............................................Passed check python ast.........................................................Failed - hook id: check-ast - exit code: 1 ... [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>

This reverts commit dafe1c4.

mssonicbld · 2023-08-07T05:15:42Z

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_dscp_mapping.py:13:1: F401 'tests.common.utilities.wait_until' imported but unused tests/qos/test_qos_dscp_mapping.py:13:1: F401 'tests.common.utilities.is_ipv4_address' imported but unused tests/qos/test_qos_dscp_mapping.py:15:1: F401 'tests.common.config_reload.config_reload' imported but unused tests/qos/test_qos_dscp_mapping.py:16:1: F401 'tests.common.helpers.assertions.pytest_require' imported but unused tests/qos/test_qos_dscp_mapping.py:17:1: F401 'abc.abstractmethod' imported but unused tests/qos/test_qos_dscp_mapping.py:18:1: F401 'tests.common.fixtures.duthost_utils.separated_dscp_to_tc_map_on_uplink' imported but unused tests/qos/test_qos_dscp_mapping.py:176:9: F841 local variable 'test_port_ids' is assigned to but never used tests/qos/test_qos_dscp_mapping.py:177:9: F841 local variable 'outer_dst_port_id' is assigned to but never used tests/qos/test_qos_dscp_mapping.py:183:9: F841 local variable 'inner_src_port_id' is assigned to but never used flake8...............................................(no files to check)Skipped ... [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>

mssonicbld · 2023-08-07T05:20:55Z

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_dscp_mapping.py:13:1: F401 'tests.common.utilities.wait_until' imported but unused tests/qos/test_qos_dscp_mapping.py:13:1: F401 'tests.common.utilities.is_ipv4_address' imported but unused tests/qos/test_qos_dscp_mapping.py:16:1: F401 'tests.common.fixtures.duthost_utils.dut_qos_maps' imported but unused 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>

tests/qos/test_qos_dscp_mapping.py

bingwang-ms · 2023-08-07T16:33:16Z

Please change the DSCP_MODE to pipe and uniform and run the test.
That can be done with a pytest param.
If the DSCP_MODE is uniform, the DSCP after decapsulation is following the outer value.
If the DSCP_MODE is pipe, the DSCP after decapsulation is not changed.

mssonicbld · 2023-08-12T00:49:12Z

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_dscp_mapping.py:249:13: E303 too many blank lines (2) 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>

developfast · 2023-08-12T02:39:07Z

/azp run

azure-pipelines · 2023-08-12T02:39:16Z

Azure Pipelines successfully started running 1 pipeline(s).

azure-pipelines · 2023-08-14T22:58:02Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2023-08-15T17:34:33Z

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_dscp_mapping.py:271:121: E501 line too long (123 > 120 characters) 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>

tests/common/helpers/ptf_tests_helper.py

tests/qos/test_qos_dscp_mapping.py

wangxin · 2023-08-28T07:48:17Z

@developfast Can you elaborate why this new test is required for older branches? Generally, we should only back port bug fixes. New features/tests should only go to master branch.

neethajohn · 2023-10-02T15:44:32Z

@wangxin, this testcase was developed to capture the dscp mapping behavior on various releases (this testcases originated as a result of an issue in production). We might end up requesting feature support from various vendors to fully support this usecase. At this point, we don't have clarity on what releases we will need to backport to but want to have this running on all releases

mssonicbld · 2023-10-24T09:33:28Z

@developfast PR conflicts with 202305 branch

mssonicbld · 2023-10-24T09:33:29Z

@developfast PR conflicts with 202012 branch

mssonicbld · 2023-10-24T09:33:31Z

@developfast PR conflicts with 202205 branch

XuChen-MSFT · 2024-01-11T16:31:38Z

@developfast can you help fix conflicts on feature branch?

Why I did it Previously we disable the global dscp_to_tc_map table as sai doesn't support it. Now they have supported it and we need it to enable inner dscp map to tc feature, so remove the old dummy macro and update testing case accordingly. How I did it Remove empty dscp_to_tc_map macro in qos.j2 and update testing case accordingly. How to verify it sonic-net/sonic-mgmt#9098 relevant test had been raised

#### Why I did it Previously we disable the global dscp_to_tc_map table as sai doesn't support it. Now they have supported it and we need it to enable inner dscp map to tc feature, so remove the old dummy macro and update testing case accordingly. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Remove empty dscp_to_tc_map macro in qos.j2 and update testing case accordingly. #### How to verify it  sonic-net/sonic-mgmt#9098 relevant test had been raised #### Which release branch to backport (provide reason below if selected)  - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### Tested branch (Please provide the tested image version)  - [x] 202405 - [ ]  #### Description for the changelog   #### Link to config_db schema for YANG module changes  #### A picture of a cute animal (not mandatory but encouraged)

#### Why I did it Previously we disable the global dscp_to_tc_map table as sai doesn't support it. Now they have supported it and we need it to enable inner dscp map to tc feature, so remove the old dummy macro and update testing case accordingly. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Remove empty dscp_to_tc_map macro in qos.j2 and update testing case accordingly. #### How to verify it  sonic-net/sonic-mgmt#9098 relevant test had been raised #### Which release branch to backport (provide reason below if selected)  - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### Tested branch (Please provide the tested image version)  - [x] 202405 - [ ]  #### Description for the changelog   #### Link to config_db schema for YANG module changes  #### A picture of a cute animal (not mandatory but encouraged)

testgap in progress

dafe1c4

developfast added 6 commits August 7, 2023 05:11

Revert "testgap in progress"

6c59abd

This reverts commit dafe1c4.

dscp to queue mapping

22df8a5

added qos map fixture

7e0b22b

added test helper func

bb2a300

rename run_test to _run_test

4aa28b4

remove unnecessary imports

4fc5dfd

flake8 fix

0c6bd6e

developfast marked this pull request as ready for review August 7, 2023 05:18

developfast requested review from XuChen-MSFT and wsycqyz as code owners August 7, 2023 05:18

developfast requested review from bingwang-ms and removed request for XuChen-MSFT and wsycqyz August 7, 2023 16:16

bingwang-ms reviewed Aug 7, 2023

View reviewed changes

tests/qos/test_qos_dscp_mapping.py Outdated Show resolved Hide resolved

bingwang-ms reviewed Aug 7, 2023

View reviewed changes

tests/qos/test_qos_dscp_mapping.py Outdated Show resolved Hide resolved

bingwang-ms reviewed Aug 7, 2023

View reviewed changes

tests/qos/test_qos_dscp_mapping.py Show resolved Hide resolved

developfast added 2 commits August 12, 2023 00:39

dscp to queue mapping test complete

42cac9c

reference output_table as global

39c4f35

Update test_qos_dscp_mapping.py

1ccccdf

developfast requested a review from bingwang-ms August 12, 2023 02:38

developfast added Request for 202012 branch Request for 202205 branch labels Aug 14, 2023

removed asic specific test

22e7ba9

flake8 fix

24b050d

bingwang-ms reviewed Aug 15, 2023

View reviewed changes

tests/common/helpers/ptf_tests_helper.py Outdated Show resolved Hide resolved

bingwang-ms reviewed Aug 15, 2023

View reviewed changes

tests/qos/test_qos_dscp_mapping.py Show resolved Hide resolved

developfast added 3 commits August 15, 2023 13:43

Update ptf_tests_helper.py for config_reload in teardown

61ba285

Update test_qos_dscp_mapping.py

c90ac62

Update test_qos_dscp_mapping.py

0641f77

bingwang-ms approved these changes Aug 15, 2023

View reviewed changes

developfast merged commit 9b1cdee into sonic-net:master Aug 17, 2023

neethajohn mentioned this pull request Aug 21, 2023

[test gap] Enhance testQosSaiDscpQueueMapping and testQosSaiDscpToPgMapping to cover IPinIP traffic #8789

Closed

wangxin added Approved for 202012 Branch Approved for 202205 branch Approved for 202305 branch labels Oct 24, 2023

mssonicbld added the Cherry Pick Conflict_202305 label Oct 24, 2023

mssonicbld added the Cherry Pick Conflict_202012 label Oct 24, 2023

mssonicbld added the Cherry Pick Conflict_202205 label Oct 24, 2023

AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Jan 25, 2024

[QoS] IP-IP DSCP to Queue Mapping Testgap (sonic-net#9098)

54ccaae

yuazhe mentioned this pull request Jan 23, 2025

Remove empty dscp_to_tc_map macro in qos.j2 sonic-net/sonic-buildimage#21515

Merged

11 tasks

mssonicbld mentioned this pull request May 27, 2025

[action] [PR:21515] Remove empty dscp_to_tc_map macro in qos.j2 sonic-net/sonic-buildimage#22714

Merged

11 tasks

Conversation

developfast commented Jul 24, 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 Jul 24, 2023

Uh oh!

mssonicbld commented Aug 7, 2023

Uh oh!

mssonicbld commented Aug 7, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bingwang-ms commented Aug 7, 2023

Uh oh!

mssonicbld commented Aug 12, 2023

Uh oh!

developfast commented Aug 12, 2023

Uh oh!

azure-pipelines bot commented Aug 12, 2023

Uh oh!

azure-pipelines bot commented Aug 14, 2023

Uh oh!

mssonicbld commented Aug 15, 2023

Uh oh!

Uh oh!

Uh oh!

wangxin commented Aug 28, 2023

Uh oh!

neethajohn commented Oct 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mssonicbld commented Oct 24, 2023

Uh oh!

mssonicbld commented Oct 24, 2023

Uh oh!

mssonicbld commented Oct 24, 2023

Uh oh!

XuChen-MSFT commented Jan 11, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

developfast commented Jul 24, 2023 •

edited

Loading

neethajohn commented Oct 2, 2023 •

edited

Loading