Skip to content

[cherry pick] #9025 Fit dualtor scenario when deleting config VLAN|mac in module vlan/test_host_vlan.py into 202012. #9081

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
yutongzhang-microsoft merged 1 commit into from
Jul 24, 2023
Merged

[cherry pick] #9025 Fit dualtor scenario when deleting config VLAN|mac in module vlan/test_host_vlan.py into 202012. #9081

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
21 changes: 11 additions & 10 deletions tests/vlan/test_host_vlan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def verify_host_port_vlan_membership(duthosts, rand_one_dut_hostname, testbed_pa


@pytest.fixture(scope="module")
def setup_host_vlan_intf_mac(duthosts, rand_one_dut_hostname, testbed_params, verify_host_port_vlan_membership):
def setup_host_vlan_intf_mac(duthosts, rand_one_dut_hostname, testbed_params, verify_host_port_vlan_membership, tbinfo):
vlan_intf, _ = testbed_params
duthost = duthosts[rand_one_dut_hostname]
dut_vlan_mac = duthost.get_dut_iface_mac('%s' % vlan_intf["attachto"])
Expand All @@ -75,16 +75,17 @@ def setup_host_vlan_intf_mac(duthosts, rand_one_dut_hostname, testbed_params, ve

yield

del_vlan_json = json.loads("""
[{
"VLAN":{
"%s":{
"mac": "%s"
}
if "dualtor" not in tbinfo["topo"]["name"]:
del_vlan_json = json.loads("""
[{
"VLAN":{
"%s":{
"mac": "%s"
}
}]
""" % (vlan_intf["attachto"], dut_vlan_mac))
delete_running_config(del_vlan_json, duthost)
}
}]
""" % (vlan_intf["attachto"], dut_vlan_mac))
delete_running_config(del_vlan_json, duthost)

wait_until(10, 2, 2, lambda: duthost.get_dut_iface_mac(vlan_intf["attachto"]) == dut_vlan_mac)

Expand Down