Skip to content
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

Silicon config support for Broadcom yml file and property overwrite #1744

Merged
merged 13 commits into from
Nov 19, 2024

Conversation

geans-pin
Copy link
Contributor

@geans-pin geans-pin commented Jul 13, 2024

Copy link

linux-foundation-easycla bot commented Jul 13, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

@ZhaohuiS
Copy link

@geans-pin
After last meeting, we have the following comments for the new design:

  • Add flag/option to allow vendor's config.bcm to override common (current behavior), but it could support to common config.bcm to override vendor's config.bcm to give better control.

First, we extract the common attributes from platform config.bcm. If it's a common config for all HWSKUs of one type of ASIC, we have to remove it from platform specific config.bcm and only keep it in common config.bcm,

It could give us a better control that we can just modify one place to sync one config change for all related HWSKUs, don't have to update platform specific config.bcm one by one.

Second, since this a huge change for config.bcm which is critical file for SAI, could you please cover how to do unit test in this design doc? Unit test is quite important to make sure config.bcm is consistent after this feature.

  • could you please consider .j2 format for common config.bcm? Support to add the logic for some specific HwSku or other scenarios?

@geans-pin
Copy link
Contributor Author

geans-pin commented Jul 20, 2024

Fix review comments :

  1. Add #section to control property level overwrite in common config
  2. ADD mode UT cases

@geans-pin geans-pin changed the title Update HLD to support YML based config Update HLD to support YML based config and Property level overwrite Aug 23, 2024
@adyeung adyeung changed the title Update HLD to support YML based config and Property level overwrite Silicon config support for Broadcom yml file and property overwrite Sep 25, 2024
@gord1306
Copy link

gord1306 commented Nov 6, 2024

One question is whether the common config can be supported for migration during image installation?

@geans-pin
Copy link
Contributor Author

One question is whether the common config can be supported for migration during image installation?

No, the common config merged is happened in the runtime syncd/sai initialize.

Geans

@adyeung
Copy link
Collaborator

adyeung commented Nov 12, 2024

@ZhaohuiS @venkatmahalingam @gord1306 HLD has been reviewed at the SONiC community review meeting on 11/5/24, if you don't have any further comments, pls help sign off and approve. This feature is targeted for 202411.

adyeung
adyeung previously approved these changes Nov 12, 2024
@gord1306
Copy link

One question is whether the common config can be supported for migration during image installation?

No, the common config merged is happened in the runtime syncd/sai initialize.

Geans

@geans-pin What I mean is not the merge operation. I'm just wondering if it isn’t copied to the new image's partition during installation, similar to how /etc/sonic/config_db.json is copied during the sonic-installer install process. If not, does that mean the user must adjust it manually after upgrading the image?

@ZhaohuiS
Copy link

@ZhaohuiS @venkatmahalingam @gord1306 HLD has been reviewed at the SONiC community review meeting on 11/5/24, if you don't have any further comments, pls help sign off and approve. This feature is targeted for 202411.

@geans-pin Did you verify whether all sonic hwskus work well with enabling the mering functionality with the latest common config.bcm?

Could you please provide the test evidence?

@geans-pin
Copy link
Contributor Author

@ZhaohuiS @venkatmahalingam @gord1306 HLD has been reviewed at the SONiC community review meeting on 11/5/24, if you don't have any further comments, pls help sign off and approve. This feature is targeted for 202411.

@geans-pin Did you verify whether all sonic hwskus work well with enabling the mering functionality with the latest common config.bcm?

Could you please provide the test evidence?

Yes, it works fine on our on-hand SONIC ODMs platforms. For Arista platforms, which we don't have, please help
to verify if the new changes cover your specific j2 config file.

@geans-pin
Copy link
Contributor Author

geans-pin commented Nov 12, 2024

One question is whether the common config can be supported for migration during image installation?

No, the common config merged is happened in the runtime syncd/sai initialize.
Geans

@geans-pin What I mean is not the merge operation. I'm just wondering if it isn’t copied to the new image's partition during installation, similar to how /etc/sonic/config_db.json is copied during the sonic-installer install process. If not, does that mean the user must adjust it manually after upgrading the image?

Unlike the config_db.json, It will not copy to new image partition. The merged happened in the syncd docker SAI initialized syncd_init_common.sh, in the syncd docker the script will copy the device config.bcm to /tmp and running the merged process on the tmp folder. For a new image install, user doesn't need to adjust anything.

Geans

@geans-pin
Copy link
Contributor Author

geans-pin commented Nov 12, 2024

@ZhaohuiS @venkatmahalingam @gord1306 HLD has been reviewed at the SONiC community review meeting on 11/5/24, if you don't have any further comments, pls help sign off and approve. This feature is targeted for 202411.

@geans-pin Did you verify whether all sonic hwskus work well with enabling the mering functionality with the latest common config.bcm?

Could you please provide the test evidence?

I uploaded UT to all these related PRs.

@geans-pin
Copy link
Contributor Author

common config UT.pdf

Add section 3.1
@adyeung adyeung merged commit 3f48329 into sonic-net:master Nov 19, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants