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][Fix bug] Fix bug and Tests for adding property 'sai_remap_prio_on_tnl_egress' #11027

Merged
merged 5 commits into from
Jun 10, 2022

Conversation

richardyu-ms
Copy link
Contributor

@richardyu-ms richardyu-ms commented Jun 4, 2022

Why I did it

Fix a bug in the template
Add tests for adding property 'sai_remap_prio_on_tnl_egress', this
property should only be added in dual tor environment.

How I did it

Add tests for adding property 'sai_remap_prio_on_tnl_egress'

How to verify it

Test done:
Run test test_j2files.py
python3 -m pytest src/sonic-config-engine/tests/test_j2files.py
=================================================================== test session starts ===================================================================
platform linux -- Python 3.7.3, pytest-3.10.1, py-1.7.0, pluggy-0.8.0
rootdir: /data/forks/sonic-buildimage/src/sonic-config-engine, inifile:
plugins: cov-2.6.0
collected 27 items                                                                                                                                        

src/sonic-config-engine/tests/test_j2files.py ...........................                                                                           [100%]

=============================================================== 27 passed in 18.84 seconds ================================================================

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 requested review from a team as code owners June 4, 2022 06:38
@richardyu-ms
Copy link
Contributor Author

this pr will be merged after #11027

@lguohan
Copy link
Collaborator

lguohan commented Jun 6, 2022

please rebase the pr and test.

richardyu added 2 commits June 8, 2022 04:37
Add tests for adding property 'sai_remap_prio_on_tnl_egress', this
property should only be added in dual tor environment.

Test done:
Run test test_j2files.py

Signed-off-by: richardyu <richardyu@contoso.com>
@richardyu-ms richardyu-ms force-pushed the add_test_tunnel_remap branch from 945debf to fdf48f9 Compare June 8, 2022 04:45
@richardyu-ms
Copy link
Contributor Author

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@liushilongbuaa
Copy link
Contributor

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@richardyu-ms richardyu-ms changed the title [Tunnel PFC] Tests for adding property 'sai_remap_prio_on_tnl_egress' [Tunnel PFC] Fix bug and Tests for adding property 'sai_remap_prio_on_tnl_egress' Jun 10, 2022
@richardyu-ms richardyu-ms force-pushed the add_test_tunnel_remap branch 2 times, most recently from 07e46c6 to 9f872b3 Compare June 10, 2022 02:38
Signed-off-by: richardyu <richardyu@contoso.com>
@richardyu-ms richardyu-ms force-pushed the add_test_tunnel_remap branch from 9f872b3 to aef99e5 Compare June 10, 2022 02:46
@richardyu-ms richardyu-ms requested a review from neethajohn June 10, 2022 06:01
@richardyu-ms richardyu-ms changed the title [Tunnel PFC] Fix bug and Tests for adding property 'sai_remap_prio_on_tnl_egress' [Tunnel PFC][Fix bug] Fix bug and Tests for adding property 'sai_remap_prio_on_tnl_egress' Jun 10, 2022
@lguohan lguohan merged commit 356b51f into sonic-net:master Jun 10, 2022
@richardyu-ms
Copy link
Contributor Author

fix in 202012 merged in b0c48f9

richardyu-ms added a commit to richardyu-ms/sonic-buildimage that referenced this pull request Jun 11, 2022
…sai_remap_prio_on_tnl_egress'

manual cherry-pick from sonic-net#11027
Fix a bug in the template
Add tests for adding property 'sai_remap_prio_on_tnl_egress', this
property should only be added in dual tor environment.
yxieca pushed a commit that referenced this pull request Jun 14, 2022
…p_prio_on_tnl_egress' (#11027)

* [Tunnel PFC] Tests for adding property 'sai_remap_prio_on_tnl_egress'

Add tests for adding property 'sai_remap_prio_on_tnl_egress', this
property should only be added in dual tor environment.

Test done:
Run test test_j2files.py

Co-authored-by: richardyu <richardyu@contoso.com>
richardyu-ms added a commit that referenced this pull request Jun 15, 2022
…sai_remap_prio_on_tnl_egress' (#11099)

* [202012][Tunnel PFC][Fix bug] Fix bug and Tests for adding property 'sai_remap_prio_on_tnl_egress'

manual cherry-pick from #11027
Fix a bug in the template
Add tests for adding property 'sai_remap_prio_on_tnl_egress', this
property should only be added in dual tor environment.

* merge change after sync from 202012 and remove a mistaken changes in cherry-pick

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
@richardyu-ms richardyu-ms deleted the add_test_tunnel_remap branch December 30, 2022 03:25
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.

5 participants