Skip to content

[action] [PR:11170] [Fdb/test_fdb]: Fixed fdb test case failure due to incomplete mac lea… #11344

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
mssonicbld merged 1 commit into from
Jan 22, 2024
Merged

[action] [PR:11170] [Fdb/test_fdb]: Fixed fdb test case failure due to incomplete mac lea… #11344

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
54 changes: 27 additions & 27 deletions tests/fdb/test_fdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,32 +243,32 @@ def setup_fdb(ptfadapter, vlan_table, router_mac, pkt_type, dummy_mac_count):
# portchannel might have no member ports or all member ports are down, so skip empty list
if not member['port_index']:
continue
port_index = member['port_index'][0]
vlan_id = vlan if member['tagging_mode'] == 'tagged' else 0
mac = ptfadapter.dataplane.get_mac(0, port_index)
# send a packet to switch to populate layer 2 table with MAC of PTF interface
send_eth(ptfadapter, port_index, mac, router_mac, vlan_id)

# put in learned MAC
fdb[port_index] = {mac}

# Send packets to switch to populate the layer 2 table with dummy MACs for each port
# Totally 10 dummy MACs for each port, send 1 packet for each dummy MAC
dummy_macs = ['{}:{:02x}:{:02x}'.format(DUMMY_MAC_PREFIX, port_index, i)
for i in range(dummy_mac_count)]

for dummy_mac in dummy_macs:
if pkt_type == "ethernet":
send_eth(ptfadapter, port_index, dummy_mac, router_mac, vlan_id)
elif pkt_type == "arp_request":
send_arp_request(ptfadapter, port_index, dummy_mac, router_mac, vlan_id)
elif pkt_type == "arp_reply":
send_arp_reply(ptfadapter, port_index, dummy_mac, router_mac, vlan_id)
else:
pytest.fail("Unknown option '{}'".format(pkt_type))

# put in set learned dummy MACs
fdb[port_index].update(dummy_macs)
for port_index in member['port_index']:
vlan_id = vlan if member['tagging_mode'] == 'tagged' else 0
mac = ptfadapter.dataplane.get_mac(0, port_index)
# send a packet to switch to populate layer 2 table with MAC of PTF interface
send_eth(ptfadapter, port_index, mac, router_mac, vlan_id)

# put in learned MAC
fdb[port_index] = {mac}

# Send packets to switch to populate the layer 2 table with dummy MACs for each port
# Totally 10 dummy MACs for each port, send 1 packet for each dummy MAC
dummy_macs = ['{}:{:02x}:{:02x}'.format(DUMMY_MAC_PREFIX, port_index, i)
for i in range(dummy_mac_count)]

for dummy_mac in dummy_macs:
if pkt_type == "ethernet":
send_eth(ptfadapter, port_index, dummy_mac, router_mac, vlan_id)
elif pkt_type == "arp_request":
send_arp_request(ptfadapter, port_index, dummy_mac, router_mac, vlan_id)
elif pkt_type == "arp_reply":
send_arp_reply(ptfadapter, port_index, dummy_mac, router_mac, vlan_id)
else:
pytest.fail("Unknown option '{}'".format(pkt_type))

# put in set learned dummy MACs
fdb[port_index].update(dummy_macs)

time.sleep(FDB_POPULATE_SLEEP_TIMEOUT)
# Flush dataplane
Expand Down Expand Up @@ -376,7 +376,7 @@ def test_fdb(ansible_adhoc, ptfadapter, duthosts, rand_one_dut_hostname, ptfhost
if port_index:
vlan_table[vlan_id].append({'port_index': port_index, 'tagging_mode': tagging_mode})

vlan_member_count = sum([len(members) for members in list(vlan_table.values())])
vlan_member_count = sum(len(port['port_index']) for members in vlan_table.values() for port in members)

fdb = setup_fdb(ptfadapter, vlan_table, router_mac, pkt_type, configured_dummay_mac_count)
for vlan in vlan_table:
Expand Down