Skip to content

Commit

Permalink
[VS] neighbor test post clean up to avoid messing up test environment (
Browse files Browse the repository at this point in the history
…sonic-net#760)

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
  • Loading branch information
jipanyang authored and lguohan committed Jan 16, 2019
1 parent fd2eb4b commit 5119b08
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tests/test_warm_reboot.py
Original file line number Diff line number Diff line change
Expand Up @@ -731,6 +731,10 @@ def test_swss_neighbor_syncup(dvs, testlog):
# check restore Count
swss_app_check_RestoreCount_single(state_db, restore_count, "neighsyncd")

# post-cleanup
dvs.runcmd("ip -s neigh flush all")
dvs.runcmd("ip -6 -s neigh flush all")

intf_tbl._del("{}|24.0.0.1/24".format(intfs[0]))
intf_tbl._del("{}|28.0.0.9/24".format(intfs[1]))
intf_tbl._del("{}|2400::1/64".format(intfs[0]))
Expand All @@ -741,8 +745,6 @@ def test_swss_neighbor_syncup(dvs, testlog):
# TODO: The condition of warm restart readiness check is still under discussion.
def test_OrchagentWarmRestartReadyCheck(dvs, testlog):

# do a pre-cleanup
dvs.runcmd("ip -s -s neigh flush all")
time.sleep(1)

dvs.runcmd("config warm_restart enable swss")
Expand Down

0 comments on commit 5119b08

Please sign in to comment.