-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Adding YANG model for TC_TO_DSCP_MAP #21395
Adding YANG model for TC_TO_DSCP_MAP #21395
Conversation
/azp run Azure.sonic-buildimage |
Azure Pipelines successfully started running 1 pipeline(s). |
@wen587 Kindly help review this PR, thx ! |
@wen587 Can you please help review? |
@@ -18,7 +18,8 @@ | |||
'DSCP_TO_FC_MAP_LIST', | |||
'EXP_TO_FC_MAP_LIST', | |||
'CABLE_LENGTH_LIST', | |||
'MPLS_TC_TO_TC_MAP_LIST' | |||
'MPLS_TC_TO_TC_MAP_LIST', | |||
'TC_TO_DSCP_MAP_LIST' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please also add this MAP to here for sonic yang support:
sonic-buildimage/src/sonic-yang-mgmt/sonic_yang_ext.py
Lines 11 to 23 in c0319e0
Type_1_list_maps_model = [ | |
'DSCP_TO_TC_MAP_LIST', | |
'DOT1P_TO_TC_MAP_LIST', | |
'TC_TO_PRIORITY_GROUP_MAP_LIST', | |
'TC_TO_QUEUE_MAP_LIST', | |
'MAP_PFC_PRIORITY_TO_QUEUE_LIST', | |
'PFC_PRIORITY_TO_PRIORITY_GROUP_MAP_LIST', | |
'DSCP_TO_FC_MAP_LIST', | |
'EXP_TO_FC_MAP_LIST', | |
'CABLE_LENGTH_LIST', | |
'MPLS_TC_TO_TC_MAP_LIST', | |
'TC_TO_DSCP_MAP_LIST' | |
] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @raaghavendrakra-arista , please add new table here for sonic yang support. Others look good to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @wen587, I didn't get you, I see that I have already added the new MAP to the table you are pointing (line 22)
correct me if I'm wrong.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I miss that.
@raaghavendrakra-arista Can you confirm if this change is required for 202405? I don't think we have the yang validator in 202405 branch. |
True, not required for 202405, this is specific to 202411 as the config_validator.py file is introduced from 202411 onwards. |
/azp run Azure.sonic-buildimage |
Azure Pipelines successfully started running 1 pipeline(s). |
Cherry-pick PR to 202411: #21463 |
@raaghavendrakra-arista cherry pick PR didn't pass PR checker. Please check!!! |
Fixed issue : sonic-net#20575 Why I did it "config-reload" in dualtor topologies were failing due to absence of TC_TO_DSCP Yang model. The above failure was seen after the the PR sonic-net/sonic-utilities#3102 How to verify it Step-1: In DUT add the yang file to "/usr/local/yang-models/sonic-tc-dscp-map.yang" to this path. Step-2: config reload -y Tested branch (Please provide the tested image version) 202411 Description for the changelog Adding YANG model for TC_TO_DSCP_MAP along with test files.
@raaghavendrakra-arista cherry pick PR didn't pass PR checker. Please check!!! |
@raaghavendrakra-arista cherry pick PR didn't pass PR checker. Please check!!! |
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md ** Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Add missing field introduced from PR: sonic-net#21395 ##### Work item tracking - Microsoft ADO **(number only)**: 31313829 #### How I did it Add the missing field #### How to verify it UT in sample_config_db.json Also test in specific DUT after merge this change. before: ``` sonic_yang(3):All Keys are not parsed in PORT_QOS_MAP dict_keys(['Ethernet16']) sonic_yang(3):exceptionList:["'tc_to_dscp_map'"] ``` after: ``` sonic_yang(6):Note: Below table(s) have no YANG models: bgpraw ``` <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Add missing field introduced from PR: #21395 ##### Work item tracking - Microsoft ADO **(number only)**: 31313829 #### How I did it Add the missing field #### How to verify it UT in sample_config_db.json Also test in specific DUT after merge this change. before: ``` sonic_yang(3):All Keys are not parsed in PORT_QOS_MAP dict_keys(['Ethernet16']) sonic_yang(3):exceptionList:["'tc_to_dscp_map'"] ``` after: ``` sonic_yang(6):Note: Below table(s) have no YANG models: bgpraw ``` <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
issue : #20575
Why I did it
"config-reload" in dualtor topologies were failing due to absence of TC_TO_DSCP Yang model.
The above failure was seen after the the PR sonic-net/sonic-utilities#3102
Work item tracking
How I did it
How to verify it
Step-1: In DUT add the yang file to "/usr/local/yang-models/sonic-tc-dscp-map.yang" to this path.
Step-2: config reload -y
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Adding YANG model for TC_TO_DSCP_MAP along with test files.
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)