Skip to content

Fix test_acl_outer_vlan #4696

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
bingwang-ms merged 1 commit into from
Nov 16, 2021
Merged

Fix test_acl_outer_vlan #4696

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
11 changes: 8 additions & 3 deletions tests/acl/test_acl_outer_vlan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from tests.common.helpers.assertions import pytest_assert, pytest_require
from tests.common.fixtures.ptfhost_utils import change_mac_addresses # lgtm[py/unused-import]
from tests.common.plugins.loganalyzer.loganalyzer import LogAnalyzer, LogAnalyzerError

from abc import abstractmethod

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -56,7 +55,8 @@

LOG_EXPECT_ACL_TABLE_CREATE_RE = ".*Created ACL table.*"
LOG_EXPECT_ACL_TABLE_REMOVE_RE = ".*Successfully deleted ACL table.*"

ARP_RESPONDER_SCRIPT_SRC_PATH = '../ansible/roles/test/files/helpers/arp_responder.py'
ARP_RESPONDER_SCRIPT_DEST_PATH = '/opt/arp_responder.py'

@pytest.fixture(scope="module", params=[IPV4, IPV6])
def ip_version(request):
Expand Down Expand Up @@ -269,6 +269,7 @@ def send_and_verify_traffic(ptfadapter, pkt, exp_pkt, src_port, dst_port, pkt_ac
elif pkt_action == ACTION_DROP:
testutils.verify_no_packet(ptfadapter, exp_pkt, dst_port)


def get_acl_counter(duthost, table_name, rule_name, timeout=ACL_COUNTERS_UPDATE_INTERVAL):
"""
Get Acl counter packets value
Expand Down Expand Up @@ -451,7 +452,7 @@ def _setup_acl_rules(self, duthost, stage, ip_ver, vlan_id, action):
logger.info("Creating ACL rule matching vlan {} action {}".format(vlan_id, action))
duthost.shell("config load -y {}".format(dest_path))

pytest_assert(wait_until(60, 2, check_rule_counters, duthost), "Acl rule counters are not ready")
pytest_assert(wait_until(60, 2, 0, check_rule_counters, duthost), "Acl rule counters are not ready")

def _remove_acl_rules(self, duthost, stage, ip_ver):
table_name = ACL_TABLE_NAME_TEMPLATE.format(stage, ip_ver)
Expand Down Expand Up @@ -647,6 +648,9 @@ def _setup_arp_responder(self, ptfhost, vlan_setup_info):

ptfhost.host.options['variable_manager'].extra_vars.update(extra_vars)
ptfhost.template(src='templates/arp_responder.conf.j2', dest='/etc/supervisor/conf.d/arp_responder.conf')
# Copy arp_responder.py script
# Please be noted that tests/script/arp_responder.py can't deal with arp request with vlan id
ptfhost.copy(src=ARP_RESPONDER_SCRIPT_SRC_PATH, dest=ARP_RESPONDER_SCRIPT_DEST_PATH)

ptfhost.command('supervisorctl reread')
ptfhost.command('supervisorctl update')
Expand All @@ -658,6 +662,7 @@ def _setup_arp_responder(self, ptfhost, vlan_setup_info):
def _teardown_arp_responder(self, ptfhost):
logger.info("Stopping arp_responder")
ptfhost.command('supervisorctl stop arp_responder')
ptfhost.file(path=ARP_RESPONDER_SCRIPT_DEST_PATH, state="absent")

def pre_running_hook(self, duthost, ptfhost, ip_version, vlan_setup_info):
# Skip on broadcom platforms
Expand Down