Skip to content

[dual-tor] Add retry to get the port mac from ptf #4287

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
kevinskwang merged 1 commit into from
Sep 17, 2021
Merged

[dual-tor] Add retry to get the port mac from ptf #4287

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: 9 additions & 2 deletions tests/common/dualtor/dual_tor_mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ip_address, IPv4Address
from tests.common import config_reload
from tests.common.dualtor.dual_tor_utils import tor_mux_intfs
from tests.common.helpers.assertions import pytest_require
from tests.common.helpers.assertions import pytest_require, pytest_assert

__all__ = [
'require_mocked_dualtor',
Expand Down Expand Up @@ -239,7 +239,14 @@ def mock_server_ip_mac_map(rand_selected_dut, tbinfo, ptfadapter, mock_server_ba
for i, intf in enumerate(tor_mux_intfs):
# For each VLAN interface, get the corresponding PTF interface MAC
ptf_port_index = dut_ptf_intf_map[intf]
ptf_mac = ptfadapter.dataplane.ports[(0, ptf_port_index)].mac()
for retry in range(10):
ptf_mac = ptfadapter.dataplane.get_mac(0, ptf_port_index)
if ptf_mac != None:
break
else:
time.sleep(2)
pytest_assert(ptf_mac != None, "fail to get mac address of interface {}".format(ptf_port_index))

server_ip_mac_map[server_ipv4_base_addr.ip + i] = ptf_mac

return server_ip_mac_map
Expand Down