matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[vstest]: remove kill exabgp command from the test (#4978)

Browse Source 
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.
This commit is contained in:
lguohan 2020-07-16 17:19:21 -07:00 committed by GitHub
parent 9905d9382d
commit 458b4aef48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/vs/tests/bgp/test_gr_livelock.py
View File

@ -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")

5
platform/vs/tests/bgp/test_no_export.py
View File

@ -5,10 +5,9 @@ import time
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")
@ -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()