search

sonic-net / sonic-platform-daemons

Platform module daemons for SONiC
Other
25 stars 159 forks source link

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

Closed keboliu closed 7 months ago

keboliu commented 8 months ago

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 https://github.com/sonic-net/sonic-buildimage/pull/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)

prgeor commented 8 months ago

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

keboliu commented 8 months ago

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

done.

prgeor commented 7 months ago

@keboliu please fix the build failure

keboliu commented 7 months ago

@keboliu please fix the build failure

fixed, would you please approve again?

keboliu commented 7 months ago

@prgeor would you please review and merge?

liat-grozovik commented 7 months ago

@prgeor can we go a head and merge?

prgeor commented 7 months ago

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

keboliu commented 7 months ago

[202311] Support to get MEDIA_SETTING and OPTICS_SI from both platform folder and HWSKU folder @prgeor done, https://github.com/sonic-net/sonic-platform-daemons/pull/460