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

[Tunnel PFC] Add property for tunnel PFC #10962

Merged
merged 5 commits into from
Jun 5, 2022

Conversation

richardyu-ms
Copy link
Contributor

@richardyu-ms richardyu-ms commented May 28, 2022

Why I did it

Add property sai_remap_prio_on_tnl_egress, which is dependent by tunnel PFC.

How I did it

Add property sai_remap_prio_on_tnl_egress, which is dependent by tunnel PFC.
This property should only be available in dual tor environment.

How to verify it

Test done:
Run test test_j2files.py
in another PR #11027

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@richardyu-ms richardyu-ms force-pushed the remap_proeprty branch 3 times, most recently from 72fb63f to 2fdd213 Compare May 28, 2022 06:03
@richardyu-ms richardyu-ms requested a review from lguohan as a code owner May 28, 2022 06:03
@richardyu-ms richardyu-ms changed the title change j2 file add remap proeprty [Tunnel PFC] Add property for tunnel PFC May 28, 2022
@richardyu-ms richardyu-ms requested a review from bingwang-ms May 28, 2022 09:00
@richardyu-ms richardyu-ms requested review from a team as code owners May 31, 2022 17:57
Replace the config.bcm file with j2 template file
- Add 'sai_remap_prio_on_tnl_egress=1' property when device metadata local
- Host subtype is 'dualtor'
- Change sai.profile foe the new config.bcm.j2
- Add tests

Test done:
Unit test.
yxieca
yxieca previously approved these changes Jun 1, 2022
@richardyu-ms
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

@richardyu-ms
Copy link
Contributor Author

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@richardyu-ms
Copy link
Contributor Author

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Ying Xie <[email protected]>
Copy link
Contributor

@yxieca yxieca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@richardyu-ms you changed config.bcm for 5 hardware skus. but only updated sai.profile for 2 of them. you need to update all 5 sai.profiles.

@yxieca yxieca self-requested a review June 4, 2022 19:10
@yxieca
Copy link
Contributor

yxieca commented Jun 4, 2022

@richardyu-ms you changed config.bcm for 5 hardware skus. but only updated sai.profile for 2 of them. you need to update all 5 sai.profiles.

ah, never mind. 7260 has right contents in sai.profiles already.

@yxieca yxieca merged commit a6c9e19 into sonic-net:master Jun 5, 2022
yxieca pushed a commit that referenced this pull request Jun 5, 2022
* [Tunnel PFC] Add property for tunnel PFC

Replace the config.bcm file with j2 template file
- Add 'sai_remap_prio_on_tnl_egress=1' property when device metadata local
- Host subtype is 'dualtor'
- Change sai.profile foe the new config.bcm.j2
richardyu-ms added a commit to richardyu-ms/sonic-buildimage that referenced this pull request Jun 6, 2022
*[Cherry-pick] [Tunnel PFC] Add property for tunnel PFC

Replace the config.bcm file with j2 template file
- Add 'sai_remap_prio_on_tnl_egress=1' property when device metadata local
- Host subtype is 'dualtor'
- Change sai.profile foe the new config.bcm.j2
richardyu-ms added a commit to richardyu-ms/sonic-buildimage that referenced this pull request Jun 6, 2022
Per PR sonic-net#10962, add a new property sai_remap_prio_on_tnl_egress. Follow the rule, need to add the property into the permitted list file.

Signed-off-by: richardyu-ms <[email protected]>
richardyu-ms added a commit to richardyu-ms/sonic-buildimage that referenced this pull request Jun 6, 2022
Per PR sonic-net#10962, added a new property sai_remap_prio_on_tnl_egress.
Follow the rule, need to add the property into the permitted list file.

Signed-off-by: richardyu-ms <[email protected]>
lguohan pushed a commit that referenced this pull request Jun 6, 2022
* [Tunnel PFC] Add property for tunnel PFC

Replace the config.bcm file with j2 template file
- Add 'sai_remap_prio_on_tnl_egress=1' property when device metadata local
- Host subtype is 'dualtor'
- Change sai.profile foe the new config.bcm.j2
StormLiangMS pushed a commit to StormLiangMS/sonic-mgmt that referenced this pull request Jul 4, 2022
**The hotfix is no longer required after PR sonic-net/sonic-buildimage#10962 is merged**

Add a hotfix for BCM SAI 7.1.0

We are seeing Mux tunnel creation failure after BCM SAI is upgrated to `7.1.0` in PR sonic-net/sonic-buildimage#10583.

This PR is to patch the `bcm.config` for `dualtor` deployment to workaround this issue until the issue is fixed in image.

This PR will add `sai_remap_prio_on_tnl_egress=1` into `bcm.config` if the device is running `master` image, and deployment is `dualtor`, and the SKU contains `arista`.

The change is validated by manually running `./testbed-cli.sh deploy-mg vms24-dual-t0-7050-2 str2 password.txt `

Signed-off-by: bingwang <[email protected]>

Reverts !577
@richardyu-ms richardyu-ms deleted the remap_proeprty branch January 16, 2023 11:29
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.

4 participants