[DPB]Removing default admin status initialization in DPB flow while loading minigraph#8711
Merged
lguohan merged 3 commits intosonic-net:masterfrom Sep 13, 2021
Merged
Conversation
Collaborator
Author
|
@zhenggen-xu Please review |
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
liat-grozovik
previously approved these changes
Sep 10, 2021
Collaborator
zhenggen-xu
reviewed
Sep 10, 2021
| "description": "Eth2/2", | ||
| "admin_status": "up", | ||
| "mtu": "9100", | ||
| "admin_status": "up", |
Collaborator
There was a problem hiding this comment.
any reason we need move this field order? Same for Ethernet4.
Collaborator
Author
There was a problem hiding this comment.
Modified it back. It was not needed.
zhenggen-xu
approved these changes
Sep 12, 2021
Collaborator
Author
|
@lguohan Can you please review and merge? This fix is crucial for running regression on 202106 |
judyjoseph
pushed a commit
that referenced
this pull request
Sep 14, 2021
…oading minigraph (#8711) To Fix #8697 . The config load_minigraph initializes 'admin_status' to up when platform.json has DPB configs. This doesn't happen when using port_config.ini The update minigraph has logic to initialize only the ports whose neighbors are defined or those belonging to portchannel However, a change was introduced to have default admin status to be 'up' in portconfig.py when the minigraph was using platform.json This will lead to sanity check failure in sonic-mgmt and thus no test cases could be run
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why I did it
To Fix #8697 . The config load_minigraph initializes 'admin_status' to up when platform.json has DPB configs. This doesn't happen when using port_config.ini
The update minigraph has logic to initialize only the ports whose neighbors are defined or those belonging to portchannel
However, a change was introduced to have default admin status to be 'up' in portconfig.py when the minigraph was using platform.json
This will lead to sanity check failure in sonic-mgmt and thus no test cases could be run
How I did it
Fixed the platform.json flow not to initialize admin_status by default. Fixed UT to ensure that different cases are handled.
How to verify it
With dpb enabled perform config load_minigraph
Which release branch to backport (provide reason below if selected)
Description for the changelog
A picture of a cute animal (not mandatory but encouraged)