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

Update dhcpv6-relay yang model #14144

Merged
merged 6 commits into from
Mar 15, 2023
Merged

Conversation

kellyyeh
Copy link
Contributor

@kellyyeh kellyyeh commented Mar 7, 2023

Why I did it

Add interface-id in dhcpv6-relay yang model

How I did it

Add interface-id option and corresponding UT. Updated configuration.md

How to verify it

kellyyeh@kellyyeh:~/sonic-buildimage/src/sonic-yang-models$ pyang -Vf tree -p /usr/local/share/yang/modules/ietf ./yang-models/sonic-dhcpv6-relay.yang

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

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

Description for 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

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

Copy link
Collaborator

@dgsudharsan dgsudharsan left a comment

Choose a reason for hiding this comment

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

I don't see rfc6939_support. Please add that as well. You need to add UT, update sample_config_db.json and update configuration guide. Please check this PR for example #13735

@kellyyeh
Copy link
Contributor Author

kellyyeh commented Mar 7, 2023

rfc6939_support

rfc6939_support is already included.


Will add UT

Copy link
Contributor

@jcaiMR jcaiMR left a comment

Choose a reason for hiding this comment

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

We may also need update test cases for this yang module.
Test cases under:
sonic-yang-models/tests/yang_model_tests/tests/

@jcaiMR
Copy link
Contributor

jcaiMR commented Mar 8, 2023

We may also need update test cases for this yang module. Test cases under: sonic-yang-models/tests/yang_model_tests/tests/

Just found there is already comments about this :-)

@zhangyanzhao
Copy link
Collaborator

@kellyyeh can you please help to fix the conflict? Thanks.

@dgsudharsan
Copy link
Collaborator

@kellyyeh Can you please resolve the conflicts and push again?

@liat-grozovik
Copy link
Collaborator

@kellyyeh please handle conflicts.
I do believe we need it for 202211 and 202205. can you please check if this can be cleanly cherry picked ?

@dgsudharsan
Copy link
Collaborator

@kellyyeh I believe the conflict still exists. Can you please check?

@kellyyeh
Copy link
Contributor Author

@kellyyeh I believe the conflict still exists. Can you please check?

Thanks, should be resolved now

@kellyyeh
Copy link
Contributor Author

@kellyyeh please handle conflicts. I do believe we need it for 202211 and 202205. can you please check if this can be cleanly cherry picked ?

Seems like it cannot be cherry-picked cleanly, I will create cherry-pick PRs after this is merged

@dgsudharsan
Copy link
Collaborator

@yxieca @kellyyeh @qiluo-msft Can you please help merge this?

@yxieca yxieca merged commit 7d585dc into sonic-net:master Mar 15, 2023
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Mar 15, 2023
Why I did it
Add interface-id in dhcpv6-relay yang model

How I did it
Add interface-id option and corresponding UT. Updated configuration.md

How to verify it
kellyyeh@kellyyeh:~/sonic-buildimage/src/sonic-yang-models$ pyang -Vf tree -p /usr/local/share/yang/modules/ietf ./yang-models/sonic-dhcpv6-relay.yang
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202205: #14245

mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Mar 19, 2023
Why I did it
Add interface-id in dhcpv6-relay yang model

How I did it
Add interface-id option and corresponding UT. Updated configuration.md

How to verify it
kellyyeh@kellyyeh:~/sonic-buildimage/src/sonic-yang-models$ pyang -Vf tree -p /usr/local/share/yang/modules/ietf ./yang-models/sonic-dhcpv6-relay.yang
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202211: #14329

mssonicbld pushed a commit that referenced this pull request Mar 19, 2023
Why I did it
Add interface-id in dhcpv6-relay yang model

How I did it
Add interface-id option and corresponding UT. Updated configuration.md

How to verify it
kellyyeh@kellyyeh:~/sonic-buildimage/src/sonic-yang-models$ pyang -Vf tree -p /usr/local/share/yang/modules/ietf ./yang-models/sonic-dhcpv6-relay.yang
@kellyyeh kellyyeh deleted the update-dhcp6-yang branch May 10, 2023 22:49
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.

8 participants