Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support different DSCP_TO_TC_MAP for T1 in dualtor deployment #11569

Merged
merged 2 commits into from
Aug 1, 2022

Conversation

bingwang-ms
Copy link
Contributor

Why I did it

This PR is to apply different DSCP_TO_TC_MAP to downlink and uplink ports on T1 in dualtor deployment.

  • For T1 downlink ports (To T0)
    The DSCP_TO_TC_MAP is not changed. DSCP2 and DSCP6 are mapped to TC2 and TC6 respectively.
  • For T1 uplink ports (To T1)
    A new DSCP_TO_TC_MAP|AZURE_UPLINK is defined and applied. DSCP2 and DSCP6 are mapped to TC1 to avoid mixing up lossy and lossless traffic from T2.

The extra lossy PG2 and PG6 added in PR #11157 is reverted as well because no traffic from T2 is mapped to PG2 or PG6 now.

How I did it

Define a new map DSCP_TO_TC_MAP|AZURE_UPLINK for 7260 T1.

How to verify it

Verified by test case in test_j2files.py.

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205

Description for the changelog

Support different DSCP_TO_TC_MAP for T1 in dualtor deployment

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@bingwang-ms bingwang-ms requested review from a team and lguohan as code owners July 28, 2022 09:43
@bingwang-ms bingwang-ms merged commit dc79935 into sonic-net:master Aug 1, 2022
neethajohn pushed a commit that referenced this pull request Aug 1, 2022
…nt (#11580)

Why I did it
This PR is to backport #11569 into 202012 branch.
This PR is to apply different DSCP_TO_TC_MAP to downlink and uplink ports on T1 in dualtor deployment.
For T1 downlink ports (To T0)
The DSCP_TO_TC_MAP is not changed. DSCP2 and DSCP6 are mapped to TC2 and TC6 respectively.
For T1 uplink ports (To T1)
A new DSCP_TO_TC_MAP|AZURE_UPLINK is defined and applied. DSCP2 and DSCP6 are mapped to TC1 to avoid mixing up lossy and lossless traffic from T2.
The extra lossy PG2 and PG6 added in PR #11157 is reverted as well because no traffic from T2 is mapped to PG2 or PG6 now.

How I did it
Define a new map DSCP_TO_TC_MAP|AZURE_UPLINK for 7260 T1.

How to verify it
Verified by test case in test_j2files.py.
yxieca pushed a commit that referenced this pull request Aug 8, 2022
* Support different DSCP_TO_TC_MAP for T1 in dualtor deployment
skbarista pushed a commit to skbarista/sonic-buildimage that referenced this pull request Aug 17, 2022
…c-net#11569)

* Support different DSCP_TO_TC_MAP for T1 in dualtor deployment
wangxin pushed a commit to sonic-net/sonic-mgmt that referenced this pull request Nov 14, 2022
What is the motivation for this PR?
This PR is to backport PR #6393 into 202012 branch.

This PR is to add two new test cases testQosSaiSeparatedDscpQueueMapping and testQosSaiSeparatedDscpToPgMapping to verify separated DSCP_TO_TC_MAP for uplink and downlink on T1.
Code change in sonic-buildimage sonic-net/sonic-buildimage#11569

How did you do it?
Swap syncd docker to syncd-rpc
Generate traffic with various DSCP value, and send the packet to DUT from uplink ports or downlink ports
Check the increment in each PG and Queue with SAI rpc call.

How did you verify/test it?
Verified on a TH2 device
```
collected 2 items                                                                                                                                                                                     

qos/test_qos_sai.py::TestQosSai::testQosSaiSeparatedDscpQueueMapping[str-7260cx3-acs-7-None-downstream] PASSED                                                                                  [ 50%]
qos/test_qos_sai.py::TestQosSai::testQosSaiSeparatedDscpQueueMapping[str-7260cx3-acs-7-None-upstream]  PASSED                                                                                    [100%]

collected 2 items                                                                                                                                                                                     

qos/test_qos_sai.py::TestQosSai::testQosSaiSeparatedDscpToPgMapping[str-7260cx3-acs-7-None-downstream] PASSED                                                                                   [ 50%]
qos/test_qos_sai.py::TestQosSai::testQosSaiSeparatedDscpToPgMapping[str-7260cx3-acs-7-None-upstream] PASSED                                                                                     [100%]
```

Any platform specific information?
No.

Supported testbed topology if it's a new test case?
T1 specific test cases.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants