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.

Sign up for GitHub

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

Jump to bottom

Add yang model for scheduler in PORT_QOS_MAP #16244

Merged
merged 2 commits into from
Aug 28, 2023
Merged

Add yang model for scheduler in PORT_QOS_MAP #16244

merged 2 commits into from
Aug 28, 2023

Conversation

stephenxs
Copy link
Collaborator

@stephenxs stephenxs commented Aug 23, 2023 •
edited by liat-grozovik
Loading

Why I did it

Add yang model for scheduler in PORT_QOS_MAP

Work item tracking
  • Microsoft ADO (number only):

How I did it

How to verify it

unit test

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)

Description for the changelog

Link to config_db schema for YANG module changes

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

@stephenxs stephenxs changed the title Add yang model for scheduler in port qos map Add yang model for scheduler in PORT_QOS_MAP Aug 23, 2023
@stephenxs stephenxs marked this pull request as ready for review August 23, 2023 15:14
@stephenxs
Copy link
Collaborator Author

The compiling issue is not relevant to the PR. Retrying

[ building ] [ target/debs/buster/libnl-3-200_3.5.0-1_armhf.deb-install ] 
ERROR: Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?
errors pretty printing info

@stephenxs
Copy link
Collaborator Author

/azpw run azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@qiluo-msft qiluo-msft added the YANG YANG model related changes label Aug 23, 2023
@ganglyu
Copy link
Contributor

ganglyu commented Aug 23, 2023

Can you update sample_config_db.json?

@stephenxs
Update config database
2670fa5 
Signed-off-by: Stephen Sun <[email protected]>
@stephenxs
Copy link
Collaborator Author

Can you update sample_config_db.json?

Done @ganglyu

@liat-grozovik
Copy link
Collaborator

@dgsudharsan could you please help to review it from yang pov? if so, i will merge once checkers are passing

liat-grozovik
liat-grozovik reviewed Aug 27, 2023
View reviewed changes
src/sonic-yang-models/tests/files/sample_config_db.json
"pfc_to_pg_map" : "pfc_prio_to_pg_map1",
"pfc_enable" : "3,4",
"pfcwd_sw_enable" : "3,4",
"scheduler" : "port_scheduler"
},
"Ethernet4": {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason Ethernet0 and Ethernet4 does not have the same number of parameters as well as in one we have indentation and in the other one we dont.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@liat-grozovik
Usually, we do not have the same port configuration on different ports because we want to have different configurations on different ports to cover different scenarios.
Regarding the indentation, I fixed the indentation in port Ethernet0 because I modified it in my PR. IMO there are many indentation issues in this file, which should not be fixed in this PR because I'm focusing on missing scheduler in this PR.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK. @qiluo-msft FYI you might want to take it to the yang subgroup as a reference and to check if need to fix the file(s)

@liat-grozovik liat-grozovik merged commit 0446d76 into sonic-net:master Aug 28, 2023
18 checks passed
@stephenxs stephenxs deleted the yang-model-port-scheduler branch August 28, 2023 14:43
stephenxs added a commit to stephenxs/sonic-buildimage that referenced this pull request Aug 31, 2023
@stephenxs
Add yang model for scheduler in PORT_QOS_MAP (sonic-net#16244)
91f2e9b 
Signed-off-by: Stephen Sun <[email protected]>
@stephenxs stephenxs mentioned this pull request Aug 31, 2023
Merged
11 tasks
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Sep 19, 2023
@stephenxs @mssonicbld
Add yang model for scheduler in PORT_QOS_MAP (sonic-net#16244)
49c0081 
Signed-off-by: Stephen Sun <[email protected]>
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202305: #16583

@mssonicbld mssonicbld mentioned this pull request Sep 19, 2023
Merged
11 tasks
StormLiangMS pushed a commit that referenced this pull request Sep 19, 2023
@stephenxs
Add yang model for scheduler in PORT_QOS_MAP (#16244) (#16359)
7ea54f5 
Signed-off-by: Stephen Sun <[email protected]>
@StormLiangMS
Copy link
Contributor

ADO: 25200395

mssonicbld pushed a commit that referenced this pull request Sep 19, 2023
@stephenxs @mssonicbld
Add yang model for scheduler in PORT_QOS_MAP (#16244)
a49860c 
Signed-off-by: Stephen Sun <[email protected]>
sonic-otn pushed a commit to sonic-otn/sonic-buildimage that referenced this pull request Sep 20, 2023
@stephenxs @sonic-otn
Add yang model for scheduler in PORT_QOS_MAP (sonic-net#16244)
ea6518b 
Signed-off-by: Stephen Sun <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ganglyu ganglyu ganglyu approved these changes

@liat-grozovik liat-grozovik liat-grozovik approved these changes

@dgsudharsan dgsudharsan dgsudharsan approved these changes

@neethajohn neethajohn Awaiting requested review from neethajohn

@bingwang-ms bingwang-ms Awaiting requested review from bingwang-ms

@qiluo-msft qiluo-msft Awaiting requested review from qiluo-msft qiluo-msft is a code owner

Assignees
No one assigned
Labels
Approved for 202305 Branch Cherry Pick Conflict_202211 Included in 202305 Branch Request for 202211 Branch Request for 202305 Branch YANG YANG model related changes
Projects
yang
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@stephenxs @mssonicbld @ganglyu @liat-grozovik @StormLiangMS @dgsudharsan @qiluo-msft @keboliu