Skip to content

[test_vlan] Update test_vlan to fix warmRestartCheck error #2328

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
Oct 12, 2020
Merged

[test_vlan] Update test_vlan to fix warmRestartCheck error #2328

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
7 changes: 5 additions & 2 deletions tests/vlan/test_vlan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ def create_vlan_interfaces(vlan_ports_list, vlan_intfs_list, duthost, ptfhost):
pvid=permit_vlanid
))

for vlan in vlan_intfs_list:
duthost.command("config interface ip add Vlan{} {}".format(vlan['vlan_id'], vlan['ip']))

@pytest.fixture(scope="module", autouse=True)
def setup_vlan(ptfadapter, duthost, ptfhost, vlan_ports_list, vlan_intfs_list, cfg_facts):
Expand Down Expand Up @@ -182,6 +180,11 @@ def tearDown(vlan_ports_list, duthost, ptfhost, vlan_intfs_list, portchannel_int

logger.info("Delete VLAN intf")
try:
for item in vlan_ports_list:
for i in vlan_ports_list[0]['permit_vlanid']:
duthost.command('ip route flush {}'.format(
item['permit_vlanid'][i]['remote_ip']))

for vlan_port in vlan_ports_list:
for permit_vlanid in vlan_port["permit_vlanid"].keys():
if int(permit_vlanid) != vlan_port["pvid"]:
Expand Down