-
Notifications
You must be signed in to change notification settings - Fork 711
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[backend] [vlan] Update acl template based on test ports (#6686)
Signed-off-by: Neetha John <nejo@microsoft.com> What is the motivation for this PR? For storage backend, new backend acl was added (sonic-net/sonic-utilities#2236). This caused regression for vlan testcases running on 't0-backend' topology. Modified the testcase to update the acl template based on the selected test ports How did you do it? Created common helpers to update the acl template and used them in 'test_vlan.py' for 't0-backend' topology How did you verify/test it? Ran 'test_vlan.py' with the changes and all cases passed ============================= test session starts ============================== platform linux2 -- Python 2.7.17, pytest-4.6.5, py-1.10.0, pluggy-0.13.1 ansible: 2.8.12 rootdir: /var/nejo_n/sonic-mgmt-int/tests, inifile: pytest.ini plugins: forked-1.3.0, metadata-1.11.0, xdist-1.28.0, html-1.22.1, repeat-0.9.1, allure-pytest-2.8.22, ansible-2.2.2 collecting ... /usr/local/lib/python2.7/dist-packages/ansible/parsing/vault/__init__.py:44: CryptographyDeprecationWarning: Python 2 is no longer supported by the Python core team. Support for it is now deprecated in cryptography, and will be removed in the next release. from cryptography.exceptions import InvalidSignature collected 7 items vlan/test_vlan.py::test_vlan_tc1_send_untagged PASSED [ 14%] vlan/test_vlan.py::test_vlan_tc2_send_tagged PASSED [ 28%] vlan/test_vlan.py::test_vlan_tc3_send_invalid_vid PASSED [ 42%] vlan/test_vlan.py::test_vlan_tc4_tagged_unicast PASSED [ 57%] vlan/test_vlan.py::test_vlan_tc5_untagged_unicast PASSED [ 71%] vlan/test_vlan.py::test_vlan_tc6_tagged_untagged_unicast PASSED [ 85%] vlan/test_vlan.py::test_vlan_tc7_tagged_qinq_switch_on_outer_tag SKIPPED [100%]
- Loading branch information
1 parent
f4dd9bd
commit 2b7b0ae
Showing
3 changed files
with
129 additions
and
1 deletion.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import os | ||
|
|
||
| BASE_DIR = os.path.dirname(os.path.realpath(__file__)) | ||
| DUT_TMP_DIR = "/tmp" | ||
| TEMPLATE_DIR = os.path.join(BASE_DIR, '../templates') | ||
| ACL_TEMPLATE = 'backend_acl_update_config.j2' | ||
|
|
||
| def apply_acl_rules(duthost, tbinfo, intf_list=None): | ||
| if "t0-backend" not in tbinfo["topo"]["name"]: | ||
| return | ||
|
|
||
| dst_acl_template = os.path.join(DUT_TMP_DIR, ACL_TEMPLATE) | ||
| dst_acl_file = os.path.join(DUT_TMP_DIR, 'backend_new_acl.json') | ||
| add_var = '' | ||
|
|
||
| if intf_list: | ||
| duthost.copy(src=os.path.join(TEMPLATE_DIR, ACL_TEMPLATE), dest=dst_acl_template) | ||
| intfs = ",".join(intf_list) | ||
| confvar = '{{"intf_list" : "{}"}}'.format(intfs) | ||
| add_var = "-a '{}' ".format(confvar) | ||
| else: | ||
| dst_acl_template = "/usr/share/sonic/templates/backend_acl.j2" | ||
|
|
||
| duthost.shell("sonic-cfggen {}-d -t {} > {}".format(add_var, dst_acl_template, dst_acl_file)) | ||
| tmp = duthost.stat(path=dst_acl_file) | ||
| if tmp['stat']['exists']: | ||
| duthost.command("acl-loader update incremental {}".format(dst_acl_file)) | ||
|
|
||
|
|
||
| def bind_acl_table(duthost, tbinfo): | ||
| if "t0-backend" not in tbinfo["topo"]["name"]: | ||
| return | ||
|
|
||
| vlan_intfs = duthost.get_vlan_intfs() | ||
| duthost.command("config acl add table DATAACL L3 -p {}".format(",".join(vlan_intfs))) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| {%- set vlan2ports = {} %} | ||
| {%- for vlan in VLAN %} | ||
| {% set portlist = [] %} | ||
| {%- for vlan_name, port in VLAN_MEMBER %} | ||
| {%- if vlan_name == vlan %} | ||
| {%- if portlist.append(port) %}{%- endif %} | ||
| {%- endif %} | ||
| {%- endfor %} | ||
| {%- set _ = vlan2ports.update({vlan: portlist| sort | join(',')}) %} | ||
| {%- endfor %} | ||
|
|
||
|
|
||
| { | ||
| "acl": { | ||
| "acl-sets": { | ||
| "acl-set": { | ||
| "DATAACL": { | ||
| "acl-entries": { | ||
| "acl-entry": { | ||
| {% for vlan, vlan_entries in VLAN.items() %} | ||
| "{{ loop.index }}": { | ||
| "config": { | ||
| "sequence-id": {{ loop.index }} | ||
| }, | ||
| "actions": { | ||
| "config": { | ||
| "forwarding-action": "ACCEPT" | ||
| } | ||
| }, | ||
| "l2": { | ||
| "config": { | ||
| "vlan_id": "{{ vlan_entries['vlanid'] }}" | ||
| } | ||
| }, | ||
| "input_interface": { | ||
| "interface_ref": { | ||
| "config": { | ||
| "interface": "{{ vlan2ports[vlan] }}" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| }, | ||
| {% endfor -%} | ||
| "999": { | ||
| "config": { | ||
| "sequence-id": 999 | ||
| }, | ||
| "actions": { | ||
| "config": { | ||
| "forwarding-action": "ACCEPT" | ||
| } | ||
| }, | ||
| "input_interface": { | ||
| "interface_ref": { | ||
| "config": { | ||
| "interface": "{{ intf_list }}" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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