[action] [PR:23534] [generic_hwsku] add platform.json support to port_alias module#1192
Merged
Merged
Conversation
<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md Please provide following information to help code review process a bit easier: --> ### Description of PR <!-- - Please include a summary of the change and which issue is fixed. - Please also include relevant motivation and context. Where should reviewer start? background context? - List any dependencies that are required for this change. --> Summary: Add `platform.json` support to the `port_alias` Ansible module. When `platform.json` contains a non-empty `interfaces` section, use it for port config lookup. Fall back to `port_config.ini` otherwise. ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [ ] Bug fix - [x] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [ ] Test case improvement ### Back port request - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [x] 202511 ### Approach #### What is the motivation for this PR? This is part of the larger effort to support generic HWSKUs. One of the steps toward that goal is removing the dependency on port_config.ini (sonic-net/sonic-buildimage#24494). The port_alias Ansible module currently relies solely on port_config.ini for port configuration, so it needs to be updated to also support platform.json. The changes are in line with the existing port config resolution logic in [device_info.py](https://github.com/sonic-net/sonic-buildimage/blob/master/src/sonic-py-common/sonic_py_common/device_info.py#L443). #### How did you do it? - Add JSON-based port config lookup: use `platform.json` when `hwsku.json` exists and `interfaces` section in `platform.json` is populated. Use `port_config.ini` otherwise - Define `_get_portmap_from_json()` to parse `platform.json` - Update module documentation to reflect the lookup priority #### How did you verify/test it? Ran the full sonic-mgmt test suite on T2 and LT2 platforms to confirm no regressions and correct port alias resolution from both JSON and INI config sources. #### Any platform specific information? #### Supported testbed topology if it's a new test case? ### Documentation <!-- (If it's a new feature, new test case) Did you update documentation/Wiki relevant to your implementation? Link to the wiki page? --> Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
Collaborator
Author
|
Original PR: sonic-net/sonic-mgmt#23534 |
Collaborator
Author
|
/azp run |
|
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
12 tasks
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
1 participant
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.
Description of PR
Summary:
Add
platform.jsonsupport to theport_aliasAnsible module. Whenplatform.jsoncontains a non-emptyinterfacessection, use it for port config lookup. Fall back toport_config.iniotherwise.Type of change
Back port request
Approach
What is the motivation for this PR?
This is part of the larger effort to support generic HWSKUs. One of the steps toward that goal is removing the dependency on port_config.ini (sonic-net/sonic-buildimage#24494). The port_alias Ansible module currently relies solely on port_config.ini for port configuration, so it needs to be updated to also support platform.json.
The changes are in line with the existing port config resolution logic in device_info.py.
How did you do it?
platform.jsonwhenhwsku.jsonexists andinterfacessection inplatform.jsonis populated. Useport_config.iniotherwise_get_portmap_from_json()to parseplatform.jsonHow did you verify/test it?
Ran the full sonic-mgmt test suite on T2 and LT2 platforms to confirm no regressions and correct port alias resolution from both JSON and INI config sources.
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation
Signed-off-by: Sonic Build Admin sonicbld@microsoft.com