Skip to content

fix tcpdump issue in bgp update timer testing #9446

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

fix tcpdump issue in bgp update timer testing #9446

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40ad456
fix tcpdump issue in bgp update timer testing
Aug 14, 2023
0dd77d9
fix format issue
Aug 14, 2023
dda4e32
fix comments
Aug 15, 2023
540f952
fix comments
Aug 15, 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
14 changes: 12 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 @@ -43,6 +43,13 @@
WAIT_TIMEOUT = 120


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
def log_bgp_updates(duthost, iface, save_path, ns):
"""Capture bgp packets to file."""
Expand All @@ -58,10 +65,13 @@ def log_bgp_updates(duthost, iface, save_path, ns):
duthost.asic_instance_from_namespace(ns).ns_arg,
start_pcap,
)
start_pcap = "nohup {}{} &".format(
start_pcap_cmd = "nohup {}{} &".format(
duthost.asic_instance_from_namespace(ns).ns_arg, start_pcap
)
duthost.shell(start_pcap)
duthost.shell(start_pcap_cmd)
if not wait_until(WAIT_TIMEOUT, 5, 20, lambda: is_tcpdump_running(duthost, start_pcap),):
pytest.fail("Could not start tcpdump")

try:
yield
finally:
Expand Down