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 for tc-dot1p and tc-dscp qosmap #2559

Merged
merged 7 commits into from
Feb 20, 2023

Conversation

dmukun
Copy link
Contributor

@dmukun dmukun commented Dec 6, 2022

What I did

  • Added support to configure TC-DOT1P qos map
  • Added support to attach TC-DOT1P qos map to interface
  • Added support to attach TC-DSCP qos map to interface
  • Modified print strings in qos map handler functions

Note: All of the above are configured via json

Why I did it
Repo code does not contain support to configure TC-DOT1P qos map or support to attach TC-DSCP qos map to interface. There is partial support to configure TC-DSCP qos map

How I verified it
Sample configuration

{
"TC_TO_DOT1P_MAP": {
        "MAP1": {
            "0" : "3",
            "1" : "3",
            "2" : "1",
            "3" : "3",
            "4" : "4",
            "5" : "2",
            "6" : "1",
            "7" : "1"
        }
},
"TC_TO_DSCP_MAP": {
        "MAP1": {
            "0" : "3",
            "1" : "23",
            "2" : "11",
            "3" : "31",
            "4" : "44",
            "5" : "23",
            "6" : "19",
            "7" : "1"
        }
},

"PORT_QOS_MAP": {
        "Ethernet12": {
            "tc_to_dscp_map"  : "MAP1",
            "tc_to_dot1p_map"  : "MAP1"
         }
    }
}
  1. Verified that L2 traffic with incoming dot1p priority is appropriatly remarked on outgoing interface (on which qos map is attached)
  2. Verified that IP DSCP field is remarked appropriately as per configuration
  3. Verified syslog, swss and sairedis.rec logs

Details if related
This commit has dependency on swss-common repo commit.
sonic-net/sonic-swss-common#721

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

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

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Dec 6, 2022

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: dmukun / name: Divya Mukundan (c2d1301)

@jarias-lfx
Copy link

/easycla

@dmukun
Copy link
Contributor Author

dmukun commented Dec 8, 2022

Note that build failure is expected as this PR is dependent on this sonic-swss-common PR which should be approved and merged first.

@bingwang-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@prsunny
Copy link
Collaborator

prsunny commented Dec 19, 2022

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@dmukun
Copy link
Contributor Author

dmukun commented Jan 5, 2023

/azp run

@azure-pipelines
Copy link

Commenter does not have sufficient privileges for PR 2559 in repo sonic-net/sonic-swss

@prsunny
Copy link
Collaborator

prsunny commented Jan 5, 2023

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@prsunny
Copy link
Collaborator

prsunny commented Jan 6, 2023

@dmukun , please add unit tests to meet the coverage requirements

@dmukun
Copy link
Contributor Author

dmukun commented Jan 18, 2023

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@prsunny
Copy link
Collaborator

prsunny commented Jan 23, 2023

@neethajohn , could you please review/signoff?

@dmukun
Copy link
Contributor Author

dmukun commented Jan 30, 2023

@neethajohn Can you review this and enable commit, please?

@dmukun
Copy link
Contributor Author

dmukun commented Feb 7, 2023

@neethajohn Can you complete this review, please?

@prsunny prsunny requested a review from bingwang-ms February 10, 2023 16:34
@prsunny
Copy link
Collaborator

prsunny commented Feb 10, 2023

@bingwang-ms , could you please review this?

@bingwang-ms
Copy link
Contributor

bingwang-ms commented Feb 17, 2023

Sorry for the delay. The change looks good to me. Thanks for correction in the log message! @dmukun

@prsunny prsunny merged commit f66abed into sonic-net:master Feb 20, 2023
@dmukun
Copy link
Contributor Author

dmukun commented Feb 20, 2023

Thank you, @prsunny @bingwang-ms

yxieca pushed a commit that referenced this pull request Feb 21, 2023
* Support for tc-dot1p and tc-dscp qosmap
AntonHryshchuk added a commit to AntonHryshchuk/sonic-buildimage that referenced this pull request Feb 22, 2023
Update sonic-swss submodule pointer to include the following:
* f66abed Support for tc-dot1p and tc-dscp qosmap ([sonic-net#2559](sonic-net/sonic-swss#2559))
* 35385ad [RouteOrch] Record ROUTE_TABLE entry programming status to APPL_STATE_DB ([sonic-net#2512](sonic-net/sonic-swss#2512))
* 0704f78 [Workaround] EvpnRemoteVnip2pOrch warmboot check failure ([sonic-net#2626](sonic-net/sonic-swss#2626))
* 4df5cab [ResponsePublisher] add pipeline support  ([sonic-net#2511](sonic-net/sonic-swss#2511))

Signed-off-by: AntonHryshchuk <antonh@nvidia.com>
dprital added a commit to dprital/sonic-buildimage that referenced this pull request Feb 23, 2023
Update sonic-swss submodule pointer to include the following:
* baa302e Do not allow to add port to .1Q bridge while router port deletion is not completed  ([sonic-net#2669](sonic-net/sonic-swss#2669))
* f66abed Support for tc-dot1p and tc-dscp qosmap ([sonic-net#2559](sonic-net/sonic-swss#2559))
* 35385ad [RouteOrch] Record ROUTE_TABLE entry programming status to APPL_STATE_DB ([sonic-net#2512](sonic-net/sonic-swss#2512))
* 0704f78 [Workaround] EvpnRemoteVnip2pOrch warmboot check failure ([sonic-net#2626](sonic-net/sonic-swss#2626))
* 4df5cab [ResponsePublisher] add pipeline support  ([sonic-net#2511](sonic-net/sonic-swss#2511))

Signed-off-by: dprital <drorp@nvidia.com>
prsunny pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Feb 23, 2023
Update sonic-swss submodule pointer to include the following:
* baa302e Do not allow to add port to .1Q bridge while router port deletion is not completed  ([#2669](sonic-net/sonic-swss#2669))
* f66abed Support for tc-dot1p and tc-dscp qosmap ([#2559](sonic-net/sonic-swss#2559))
* 35385ad [RouteOrch] Record ROUTE_TABLE entry programming status to APPL_STATE_DB ([#2512](sonic-net/sonic-swss#2512))
* 0704f78 [Workaround] EvpnRemoteVnip2pOrch warmboot check failure ([#2626](sonic-net/sonic-swss#2626))
* 4df5cab [ResponsePublisher] add pipeline support  ([#2511](sonic-net/sonic-swss#2511))
StormLiangMS pushed a commit that referenced this pull request Mar 7, 2023
* Support for tc-dot1p and tc-dscp qosmap
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.

7 participants