[DT2] Support LowerSpineRouter as subtype#22465
Closed
bingwang-ms wants to merge 4 commits intosonic-net:masterfrom
Closed
[DT2] Support LowerSpineRouter as subtype#22465bingwang-ms wants to merge 4 commits intosonic-net:masterfrom
bingwang-ms wants to merge 4 commits intosonic-net:masterfrom
Conversation
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
Author
|
minigraph.py is protected and can't be updated. |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
arlakshm
previously approved these changes
May 10, 2025
src/sonic-config-engine/minigraph.py
Outdated
| elif macsec_enabled == 'False': | ||
| results['DEVICE_METADATA']['localhost']['subtype'] = 'DownstreamLC' | ||
| # If a devive is SpineRouter but not a chassis, then it's a lower spine router | ||
| if not is_minigraph_for_chassis(chassis_type): |
Contributor
There was a problem hiding this comment.
this may not work. The minigraph of the upperT2 not is_minigraph_for_chassis(chassis_type) will also be True.
Contributor
There was a problem hiding this comment.
This may not break chassis, because in the minigraph generated in sonic-mgmt for T2 not is_minigraph_for_chassis(chassis_type) will be True
Contributor
Author
There was a problem hiding this comment.
this may not work. The minigraph of the upperT2
not is_minigraph_for_chassis(chassis_type)will also be True.
For UT2, results['DEVICE_METADATA']['localhost']['type'] will be UpperSpineRouter. So we should be good.
Contributor
Author
|
@arlakshm Seems checking |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
arlakshm
approved these changes
May 16, 2025
11 tasks
bingwang-ms
added a commit
to Azure/sonic-buildimage-msft
that referenced
this pull request
May 16, 2025
<!--
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
Cherry-pick from
sonic-net/sonic-buildimage#22465
This PR is to support `LowerSpineRouter` as a subtype in minigraph
parser.
##### Work item tracking
- Microsoft ADO **32614515**:
#### How I did it
If a device is `SpineRouter`, then try to parse `SubType` from
minigraph.
#### How to verify it
The change is verified by UT.
<!--
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.
-->
This PR is to support `LowerSpineRouter` as a subtype in minigraph
parser.
#### 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
-->
No YANG model change.
#### A picture of a cute animal (not mandatory but encouraged)
Contributor
Author
|
Included in 202503 by PR Azure/sonic-buildimage-msft#1130 |
Contributor
Author
|
Closing this PR as it's not needed any more |
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
3 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
This PR is to support
LowerSpineRouteras a subtype in minigraph parser.Work item tracking
How I did it
If a device is
SpineRouter, then try to parseSubTypefrom minigraph.How to verify it
The change is verified by UT.
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
This PR is to support
LowerSpineRouteras a subtype in minigraph parser.Link to config_db schema for YANG module changes
No YANG model change.
A picture of a cute animal (not mandatory but encouraged)