-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
7260cx3 DualToR config.bcm support based on DualToR setting in device metadata at boot time #7168
Merged
Conversation
This file contains 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
… metadata at boot time
… metadata at boot time
lguohan
reviewed
Mar 28, 2021
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/append.config.j2
Outdated
Show resolved
Hide resolved
lguohan
reviewed
Mar 28, 2021
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/append.config.j2
Outdated
Show resolved
Hide resolved
lguohan
reviewed
Mar 28, 2021
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/append.config.j2
Outdated
Show resolved
Hide resolved
lguohan
reviewed
Mar 28, 2021
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/append.config.j2
Outdated
Show resolved
Hide resolved
lguohan
reviewed
Mar 28, 2021
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/append.config.j2
Outdated
Show resolved
Hide resolved
lguohan
reviewed
Mar 28, 2021
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/append.config.j2
Outdated
Show resolved
Hide resolved
lguohan
reviewed
Mar 28, 2021
lguohan
reviewed
Mar 28, 2021
lguohan
reviewed
Mar 28, 2021
lguohan
reviewed
Mar 28, 2021
lguohan
requested changes
Mar 28, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🕐
… bottom based on comments received
lguohan
reviewed
Mar 29, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please wait for ying approval as well.
lguohan
previously approved these changes
Mar 29, 2021
@yxieca Appreciate if you can take a look at my changes to see if any changes required. |
yxieca
reviewed
Mar 30, 2021
lguohan
approved these changes
Mar 31, 2021
daall
pushed a commit
that referenced
this pull request
Apr 15, 2021
… metadata at boot time (#7168) * 7260cx3 DualToR config.bcm support based on DualToR setting in device metadata at boot time. For HWSKU Arista-7260CX3-C64 the MMU setting SOC for T0/T1 is also combined into the config.bcm.j2 logic so use just one config file and adding delta based on Switch Roles.
raphaelt-nvidia
pushed a commit
to raphaelt-nvidia/sonic-buildimage
that referenced
this pull request
May 23, 2021
… metadata at boot time (sonic-net#7168) * 7260cx3 DualToR config.bcm support based on DualToR setting in device metadata at boot time. For HWSKU Arista-7260CX3-C64 the MMU setting SOC for T0/T1 is also combined into the config.bcm.j2 logic so use just one config file and adding delta based on Switch Roles.
carl-nokia
pushed a commit
to carl-nokia/sonic-buildimage
that referenced
this pull request
Aug 7, 2021
… metadata at boot time (sonic-net#7168) * 7260cx3 DualToR config.bcm support based on DualToR setting in device metadata at boot time. For HWSKU Arista-7260CX3-C64 the MMU setting SOC for T0/T1 is also combined into the config.bcm.j2 logic so use just one config file and adding delta based on Switch Roles.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
In order to support DualToR IPinIP functionality for 7260CX3 SKUs there are new BRCM SOC properties required. We do not want these new SOC properties to be applied for all 7260CX3 SKUs but to base on the DUT role to decide which DUT should include these new SOC properties at boot time.
How I did it
Added code to check the device metadata to inspect if the DUT is configured for DualToR functionality. Renamed/Updated the current config.bcm file of the supported 7260cx3 SKUs to optionally include the IPinIP required SOC properties based on the DUT DualToR role. This file is used for "sonic-cfggen" at boot time to dynamically generate the required config.bcm file to be used by BRCM SDK. This new method eliminated the need to have multiple versions of config.bcm files where the delta is small.
NOTE:
This PR has pulled in the changes made by (#7027)
and converted the config.bcm selection to use this new method since the MMU selection SOC property is the only line of difference between the T0 and T1 config.bcm files based on the switch role being T0 or T1.
How to verify it
Manually changed the device metadata to either include or don't include the DualToR role and verify that the correct bcm.config is installed in the ASIC.
Here is the verification output for the case where the 7260cx3 is not configured for DualToR purpose:
Here is the validation for the case where a 7260CX3 do have DualToR configure:
Here is the result when the same code is running on a non 7260cx3 SKU where the config .bcm setup remains unchanged and continue to load from the original config.bcm file without going through "sonic-cfggen":
Which release branch to backport (provide reason below if selected)
Description for the changelog
7260cx3 dynamic generate config.bcm based on DualToR role at boot time to add IPinIP support.