Cleanup the VNET configuration based on parameter#936
Merged
prsunny merged 1 commit intosonic-net:masterfrom Jun 4, 2019
Merged
Cleanup the VNET configuration based on parameter#936prsunny merged 1 commit intosonic-net:masterfrom
prsunny merged 1 commit intosonic-net:masterfrom
Conversation
volodymyrsamotiy
approved these changes
May 31, 2019
stepanblyschak
pushed a commit
to stepanblyschak/sonic-mgmt
that referenced
this pull request
Jun 14, 2019
auspham
pushed a commit
to auspham/sonic-mgmt
that referenced
this pull request
Feb 3, 2026
<!-- Please make sure you've read and understood our contributing guidelines; https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md Please provide following information to help code review process a bit easier: --> ### Description of PR <!-- - Please include a summary of the change and which issue is fixed. - Please also include relevant motivation and context. Where should reviewer start? background context? - List any dependencies that are required for this change. --> Summary: test_hash is flaky on FT2 testbed because there is not enough entropy in hash key `ip-proto` to ensure traffic is balanced evenly among all 64 nexthops. This PR fixed the issue by removing `ip-proto` from hash_keys. ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [ ] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [x] Test case improvement ### Back port request - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [ ] 202511 - [x] 202503 ### Approach #### What is the motivation for this PR? This PR fixed the `test_hash` on FT2 topo by removing `ip-proto` from hash_keys. #### How did you do it? Check if the topo type is `ft2` and remove `ip-proto` from `hash_keys`. #### How did you verify/test it? The change is verified on a physical testbed. ``` collected 15 items fib/test_fib.py::test_basic_fib[True-True-1514] PASSED [ 6%] fib/test_fib.py::test_hash[ipv4] ^H ^H ^H ^H ^H ^HPASSED [ 13%] fib/test_fib.py::test_hash[ipv6] ^H ^H ^H ^H ^H ^HPASSED [ 20%] fib/test_fib.py::test_ipinip_hash[ipv4] SKIPPED (The test case runs on T1 topology) [ 26%] fib/test_fib.py::test_ipinip_hash[ipv6] SKIPPED (The test case runs on T1 topology) [ 33%] fib/test_fib.py::test_ipinip_hash_negative[ipv4] ^HPASSED [ 40%] fib/test_fib.py::test_ipinip_hash_negative[ipv6] ^H ^HPASSED [ 46%] fib/test_fib.py::test_vxlan_hash[ipv4-ipv4] ^H ^HPASSED [ 53%] fib/test_fib.py::test_vxlan_hash[ipv4-ipv6] ^H ^HPASSED [ 60%] fib/test_fib.py::test_vxlan_hash[ipv6-ipv6] ^HPASSED [ 66%] fib/test_fib.py::test_vxlan_hash[ipv6-ipv4] ^H ^HPASSED [ 73%] fib/test_fib.py::test_nvgre_hash[ipv4-ipv4] SKIPPED (Nvgre hash test is not fully supported on VS and Broadcom platform; Not supported on M*. Skip on t1-isolated-d32/128 topos) [ 80%] fib/test_fib.py::test_nvgre_hash[ipv4-ipv6] SKIPPED (Nvgre hash test is not fully supported on VS and Broadcom platform; Not supported on M*. Skip on t1-isolated-d32/128 topos) [ 86%] fib/test_fib.py::test_nvgre_hash[ipv6-ipv6] SKIPPED (Nvgre hash test is not fully supported on VS and Broadcom platform; Not supported on M*. Skip on t1-isolated-d32/128 topos) [ 93%] fib/test_fib.py::test_nvgre_hash[ipv6-ipv4] SKIPPED (Nvgre hash test is not fully supported on VS and Broadcom platform; Not supported on M*. Skip on t1-isolated-d32/128 topos) [100%] ``` #### Any platform specific information? No. #### Supported testbed topology if it's a new test case? Not a new test. ### Documentation <!-- (If it's a new feature, new test case) Did you update documentation/Wiki relevant to your implementation? Link to the wiki page? -->
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description of PR
Summary: Skip cleanup configuration if set to False. This is required for Warmboot tests
Fixes # (issue)
Type of change
How did you do it?
Added a config parameter to pass
cleanup = True/FalseHow did you verify/test it?
ansible-playbook test_sonic.yml -i str --limit str-a7170-acs-1 --vault-password-file password.txt -e testcase_name=vnet_vxlan -e testbed_name=vms13-t0-a7170 -e cleanup=FalseVerify entries are not removed
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation
Notes:
Observed a playbook bug that
block-whencondition is not working when there is include yml file (include: ptf_runner.yml). Workaround to have the conditional check on each item. If a fix is available, individual conditional check can be removed and added to block.