Skip to content

Added function for removing ACL table in sub-ports TC #5543

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.

Sign up for GitHub

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

Merged
ZhaohuiS merged 1 commit into from
Jul 7, 2022
Merged

Added function for removing ACL table in sub-ports TC #5543

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions tests/sub_port_interfaces/sub_ports_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,7 @@ def get_port(duthost, ptfhost, interface_num, port_type, ports_to_exclude=None,
ptf_ports[port_id] = ptf_ports_available_in_topo[port_id]

if 'port_in_lag' in port_type:
remove_acl_table(duthost, config_port_indices)
Copy link
Copy Markdown
Collaborator

@wangxin wangxin Apr 30, 2022

Choose a reason for hiding this comment

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

Does this configuration change need to be restored after testing is done?

Copy link
Copy Markdown
Contributor Author

@OleksandrKozodoi OleksandrKozodoi May 3, 2022

Choose a reason for hiding this comment

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

Hi @wangxin. This configuration is restored per test case:
https://github.com/Azure/sonic-mgmt/blob/master/tests/sub_port_interfaces/conftest.py#L537
Also, there is reload of the configuration after the test suite:
https://github.com/Azure/sonic-mgmt/blob/master/tests/sub_port_interfaces/conftest.py#L568-L577

lag_port_map = create_lag_port(duthost, config_port_indices)
bond_port_map = create_bond_port(ptfhost, ptf_ports)

Expand All @@ -779,6 +780,23 @@ def get_port(duthost, ptfhost, interface_num, port_type, ports_to_exclude=None,
return (config_port_indices, ptf_ports.values())


def remove_acl_table(duthost, config_port_indices):
"""
Remove ACL table when ingress/egress ACL binding is configured on LAG members

Args:
duthost: DUT host object
config_port_indices: Dictionary of port on the DUT
"""
acl_facts = duthost.acl_facts()["ansible_facts"]["ansible_acl_facts"]
port_list = config_port_indices.values()

for table_name in acl_facts.keys():
acl_ports = acl_facts[table_name].get("ports", [])
if set(acl_ports).intersection(port_list):
duthost.shell('config acl remove table {}'.format(table_name))


def remove_sub_port(duthost, sub_port, ip):
"""
Remove sub-port from redis-db
Expand Down