Skip to content

Support to get MEDIA_SETTING and OPTICS_SI from both platform folder and HWSKU folder #456

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

Merged
merged 6 commits into from
Apr 17, 2024

Conversation

keboliu
Copy link
Collaborator

@keboliu keboliu commented Apr 1, 2024

Description

Support to get the media_settings.json and optics_si_settings.json files from both the platform folder and the SKU folder.
It will search the HWSKU folder first and then fall back to the platform folder.

combine with PR sonic-net/sonic-buildimage#18441, the vendor will be able to enable CMIS cable host mgmt. function per SKU(choose to put the specific pmon_daemon_control.json, media_settings.json and optics_si_settings.json to the SKU folder).

Motivation and Context

The vendor will have the flexibility to have both files in the platform scope or the SKU scope.

How Has This Been Tested?

Build image, manually test,

  1. put files in the platform folder, the settings should be able to be loaded.
  2. put files in the SKU folder, the settings should be able to be loaded.
  3. put the files in both platform and SKU folder, the settings in the SKU folder will be loaded.

Additional Information (Optional)

@keboliu keboliu force-pushed the master_media_optics_setting branch from 7454f8c to 90a1af6 Compare April 1, 2024 13:11
@keboliu keboliu marked this pull request as ready for review April 1, 2024 13:23
@prgeor
Copy link
Collaborator

prgeor commented Apr 1, 2024

@keboliu Pleas specify the other dependent PR in the description.

@prgeor prgeor requested a review from mihirpat1 April 1, 2024 15:04
@keboliu
Copy link
Collaborator Author

keboliu commented Apr 2, 2024

@keboliu Pleas specify the other dependent PR in the description.

done.

prgeor
prgeor previously approved these changes Apr 9, 2024
@prgeor
Copy link
Collaborator

prgeor commented Apr 9, 2024

@keboliu please fix the build failure

Signed-off-by: Kebo Liu <[email protected]>
@keboliu
Copy link
Collaborator Author

keboliu commented Apr 9, 2024

@keboliu please fix the build failure

fixed, would you please approve again?

@keboliu
Copy link
Collaborator Author

keboliu commented Apr 12, 2024

@prgeor would you please review and merge?

@liat-grozovik
Copy link
Collaborator

@prgeor can we go a head and merge?

@prgeor prgeor merged commit 25e22cd into sonic-net:master Apr 17, 2024
5 checks passed
@prgeor
Copy link
Collaborator

prgeor commented Apr 17, 2024

@liat-grozovik @keboliu there is cherry pick conflict for 202311. please raise separate PR for 202311

@keboliu
Copy link
Collaborator Author

keboliu commented Apr 21, 2024

[202311] Support to get MEDIA_SETTING and OPTICS_SI from both platform folder and HWSKU folder
@prgeor done, #460

@keboliu keboliu deleted the master_media_optics_setting branch April 21, 2024 09:13
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.

6 participants