From b302b780fe5d427e6bf4f94b4f542a358ff06fe7 Mon Sep 17 00:00:00 2001 From: bingwang Date: Fri, 9 Oct 2020 23:58:23 -0700 Subject: [PATCH] Update test_vlan 1. Add a cleanup for static route added in test setup 2. Remove duplicate 'ip add' for Vlan interface --- tests/vlan/test_vlan.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/vlan/test_vlan.py b/tests/vlan/test_vlan.py index 2ecbbda3e3c..09fe16ac72b 100644 --- a/tests/vlan/test_vlan.py +++ b/tests/vlan/test_vlan.py @@ -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): @@ -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"]: