Skip to content

[cherry pick] 202012 fix tcpdump issue in bgp_update_timer script #9481

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
wangxin merged 2 commits into from
Aug 16, 2023
Merged

[cherry pick] 202012 fix tcpdump issue in bgp_update_timer script #9481

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7d3164
fix tcpdump issue in bgp_update_timer script
Aug 16, 2023
d9915bf
Merge branch '202012' into dev/jcai_202012_bgp_update_timer_fix
jcaiMR Aug 16, 2023
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
18 changes: 16 additions & 2 deletions tests/bgp/test_bgp_update_timer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@
NEIGHBOR_PORT0 = 11000
NEIGHBOR_PORT1 = 11001
WAIT_TIMEOUT = 120
TCPDUMP_WAIT_TIMEOUT = 20


def is_tcpdump_running(duthost, cmd):
check_cmd = "ps u -C tcpdump | grep '%s'" % cmd
if cmd in duthost.shell(check_cmd)['stdout']:
return True
return False


@contextlib.contextmanager
Expand All @@ -48,8 +56,14 @@ def log_bgp_updates(duthost, iface, save_path, ns):
start_pcap = "tcpdump -i %s -w %s port 179" % (iface, save_path)
# for multi-asic dut, add 'ip netns exec asicx' to the beggining of tcpdump cmd
stop_pcap = "sudo pkill -f '%s%s'" % (duthost.asic_instance_from_namespace(ns).ns_arg, start_pcap)
start_pcap = "nohup {}{} &".format(duthost.asic_instance_from_namespace(ns).ns_arg, start_pcap)
duthost.shell(start_pcap)
start_pcap_cmd = "nohup {}{} &".format(duthost.asic_instance_from_namespace(ns).ns_arg, start_pcap)
duthost.shell(start_pcap_cmd)
# wait until tcpdump process created
if not wait_until(WAIT_TIMEOUT, 5, 1, lambda: is_tcpdump_running(duthost, start_pcap),):
pytest.fail("Could not start tcpdump")
# sleep and wait for tcpdump ready to sniff packets
time.sleep(TCPDUMP_WAIT_TIMEOUT)

try:
yield
finally:
Expand Down