Skip to content

Commit

Permalink
[vstest]: remove kill exabgp command from the test (sonic-net#4978)
Browse files Browse the repository at this point in the history
the command kills all exabgp processes on the host.
since the namespaces are newly added, there should
be no prior exabgp processes.

if it is existing namespace, it is also the dvs
framework job to clean up all prior processes.
  • Loading branch information
lguohan authored Jul 17, 2020
1 parent 9905d93 commit 458b4ae
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion platform/vs/tests/bgp/test_gr_livelock.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ def test_gr_livelock(dvs, testlog):
dvs.servers[0].runcmd("pip install 'exabgp==4.0.10' --force-reinstall ")
#
dvs.copy_file("/etc/frr/", "bgp/files/gr_livelock/bgpd.conf")
dvs.servers[0].runcmd("pkill exabgp") # In case previous test didn't stop exa
dvs.runcmd("supervisorctl stop bgpd")
time.sleep(5)
dvs.runcmd("supervisorctl start bgpd")
Expand Down
5 changes: 2 additions & 3 deletions platform/vs/tests/bgp/test_no_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
import json

def test_bounce(dvs, testlog):
dvs.servers[0].runcmd("pkill -f exabgp")
dvs.copy_file("/etc/frr/", "bgp/files/no_export/bgpd.conf")
dvs.runcmd("supervisorctl start bgpd")
dvs.runcmd("ip addr add 10.0.0.0/31 dev Ethernet0")
dvs.runcmd("ip addr add 10.0.0.0/31 dev Ethernet0")
dvs.runcmd("config interface startup Ethernet0")

dvs.runcmd("ip addr add 10.0.0.2/31 dev Ethernet4")
Expand All @@ -30,7 +29,7 @@ def test_bounce(dvs, testlog):
(exit_code, sum_res) = dvs.runcmd(["vtysh", "-c", "show ip bgp sum"])
(exit_code, all_route) = dvs.runcmd(["vtysh", "-c", "show ip bgp"])
(exit_code, announce_route) = dvs.runcmd(["vtysh", "-c", "show ip bgp neighbors 10.0.0.3 advertised-routes"])

p1.terminate()
p1 = p1.wait()

Expand Down

0 comments on commit 458b4ae

Please sign in to comment.