Skip to content

[202012] [cherry-pick] Generate switch level dscp_to_tc_map entry from qos_config template#11132

Merged
bingwang-ms merged 5 commits intosonic-net:202012from
bingwang-ms:add_global_in_port_qos_map_202012
Jun 17, 2022
Merged

[202012] [cherry-pick] Generate switch level dscp_to_tc_map entry from qos_config template#11132
bingwang-ms merged 5 commits intosonic-net:202012from
bingwang-ms:add_global_in_port_qos_map_202012

Conversation

@bingwang-ms
Copy link
Copy Markdown
Contributor

@bingwang-ms bingwang-ms commented Jun 14, 2022

Why I did it

This PR is to cherry-pick #11087 into 202012 branch after resolving conflicts.

This PR is to update template for generating switch level DSCP_TO_TC_MAP config.
After PR #10565, there will be two DSCP_TO_TC_MAP

  • DSCP_TO_TC_MAP|AZURE is the default map, which is used at port level and switch level
  • DSCP_TO_TC_MAP|AZURE_TUNNEL is used to remap the priority of tunnel traffic in dualtor deployment

To address the issue, an entry PORT_QOS_MAP|global will be added into config_db

"PORT_QOS_MAP": {
        "global": {
            "dscp_to_tc_map": "AZURE"
        }
}

The entry is generated from qos_config.j2.

Related PRs

Repo PR title State
sonic-swss [202012]Apply DSCP_TO_TC_MAP from PORT_QOS_MAP|global to switch level GitHub issue/pull request detail
sonic-utilities [202012]Update db_migrator to support PORT_QOS_MAP|global GitHub issue/pull request detail

How I did it

Update the template qos_config.j2.

How to verify it

Verified by vstest.

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

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

Description for the changelog

This PR is to update template for generating switch level DSCP_TO_TC_MAP config.

Link to config_db schema for YANG module changes

TODO

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

Signed-off-by: bingwang <wang.bing@microsoft.com>
@bingwang-ms bingwang-ms changed the title [202012] [cherry-pick] Add global in port qos map 202012 [202012] [cherry-pick] Generate switch level dscp_to_tc_map entry from qos_config template Jun 14, 2022
@bingwang-ms
Copy link
Copy Markdown
Contributor Author

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@bingwang-ms bingwang-ms requested a review from prsunny June 14, 2022 09:22
Signed-off-by: bingwang <wang.bing@microsoft.com>
@stephenxs
Copy link
Copy Markdown
Collaborator

AFAIK, there is no logic to apply DSCP_TO_TC table on the switch on 202012 branch.
do we still need the global DSCP_TO_TC map in 202012?

@bingwang-ms
Copy link
Copy Markdown
Contributor Author

AFAIK, there is no logic to apply DSCP_TO_TC table on the switch on 202012 branch. do we still need the global DSCP_TO_TC map in 202012?

Yes, we need to apply DSCP_TO_TC to switch on 202012 branch. I posted a PR for swss change on 202012 branch sonic-net/sonic-swss#2328

Signed-off-by: bingwang <wang.bing@microsoft.com>
Signed-off-by: bingwang <wang.bing@microsoft.com>
Comment thread src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cq2-lc.json Outdated
Signed-off-by: bingwang <wang.bing@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants