Skip to content

[test_fdb] Fix test_fdb failure caused by FDB aging. #2658

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 3 commits into from
Dec 15, 2020
Merged

[test_fdb] Fix test_fdb failure caused by FDB aging. #2658

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c20dbf
Fix test_fdb failure caused by FDB aging.
bingwang-ms Dec 14, 2020
5ff3685
Use swssconfig to load switch config to disable fdb aging.
bingwang-ms Dec 14, 2020
04c5890
Update send_arp_request to use router mac.
bingwang-ms Dec 15, 2020
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
16 changes: 16 additions & 0 deletions tests/common/fixtures/duthost_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import pytest
import logging
import re

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -72,3 +73,18 @@ def disable_route_checker_module(duthosts, rand_one_dut_hostname):
duthost = duthosts[rand_one_dut_hostname]
for func in _disable_route_checker(duthost):
yield func

@pytest.fixture(scope='module')
def disable_fdb_aging(duthost):
"""
Disable fdb aging by bcmcmd 'age 0'.
The original config will be recovered after running test.
"""
cmd = "bcmcmd \'age {}\'"
output = duthost.shell("bcmcmd \'age\'")['stdout']
default_age = re.findall("Current age timer is (\d+).", output)
duthost.shell(cmd.format(0))
yield
# recover default aging time
duthost.shell(cmd.format(default_age))

4 changes: 3 additions & 1 deletion tests/fdb/test_fdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@

from tests.common.fixtures.ptfhost_utils import change_mac_addresses # lgtm[py/unused-import]
from tests.common.fixtures.ptfhost_utils import remove_ip_addresses # lgtm[py/unused-import]
from tests.common.fixtures.duthost_utils import disable_fdb_aging

pytestmark = [
pytest.mark.topology('t0')
pytest.mark.topology('t0'),
pytest.mark.usefixtures('disable_fdb_aging')
]

DEFAULT_FDB_ETHERNET_TYPE = 0x1234
Expand Down