Support 2 vlan config in topology for test_acl #16322
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
Signed-off-by: Zhaohui Sun <[email protected]>
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Copilot reviewed 1 out of 1 changed files in this pull request and generated no comments.
Comments suppressed due to low confidence (1)
tests/acl/test_acl.py:318
- Reassigning vlan_name without checking if it was already defined or used earlier could lead to unexpected behavior. Consider checking if vlan_name is already defined before reassigning it.
vlan_name = list(vlan_table.keys())[0]
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.
Description of PR
Summary:
Fixes # (issue)
test_acl failed due to failed on
setup with "KeyError: 'Vlan1000'"after changing to use 2vlan in topo file.Type of change
Back port request
Approach
What is the motivation for this PR?
If enable 2vlan config in topology file(such as
ansible/vars/topo_t0-116.yml):change from
to
Then vlan name is not Vlan1000 anymore, it could be Vlan100 or Vlan200.
So, in https://github.com/sonic-net/sonic-mgmt/pull/9334/files, it sets default vlan name to Vlan1000 in
pytest_generate_testsfor T0 is not very reasonable.How did you do it?
So, in test_acl, for T0 topology, still get vlan name from config, not from
vlan_nameparameter, then test_acl can pass.How did you verify/test it?
Run test_acl on testbed with 2vlan config.
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation