Skip to content
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.

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

fix tcpdump issue in bgp update timer testing #9446

Merged
merged 4 commits into from
Aug 16, 2023

Conversation

jcaiMR
Copy link
Contributor

@jcaiMR jcaiMR commented Aug 14, 2023

Description of PR

Fix test_bgp_update_timer.py issue on T0 and T1, which caused by background running tcpdump issue.

Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Back port request

  • 201911
  • 202012
  • 202205

Approach

What is the motivation for this PR?

Fix test_bgp_update_timer.py issue on T0 and T1, which caused by background running tcpdump.
In script using "nohup <> &" running without waiting for tcpdump tool real running on DUT.
So in some failure case, bgp update sendout but tcpdump still not ready to capture packets and cause failure with saying bgp update not found.

How did you do it?

Wait until tcpdump tool running on DUT before continue testing

How did you verify/test it?

Keep running 10 times on KVM environment without failure.

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@mssonicbld
Copy link
Collaborator

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

tests/bgp/test_bgp_update_timer.py:45:1: E302 expected 2 blank lines, found 1
tests/bgp/test_bgp_update_timer.py:51:1: E302 expected 2 blank lines, found 1

flake8...............................................(no files to check)Skipped
check conditional mark sort..........................(no files to check)Skipped

To run the pre-commit checks locally, you can follow below steps:

  1. Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
    the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
    docker container.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

StormLiangMS
StormLiangMS previously approved these changes Aug 15, 2023
Copy link
Collaborator

@StormLiangMS StormLiangMS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Collaborator

@yejianquan yejianquan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jcaiMR jcaiMR merged commit 23eb6a9 into sonic-net:master Aug 16, 2023
11 checks passed
@jcaiMR jcaiMR deleted the dev/jcai_fix_bgp_tcpdump branch August 16, 2023 00:46
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Aug 16, 2023
* fix tcpdump issue in bgp update timer testing
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202305: #9471

@mssonicbld
Copy link
Collaborator

@jcaiMR PR conflicts with 202012 branch

@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202205: #9472

mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Aug 16, 2023
* fix tcpdump issue in bgp update timer testing
mssonicbld pushed a commit that referenced this pull request Aug 16, 2023
* fix tcpdump issue in bgp update timer testing
mssonicbld pushed a commit that referenced this pull request Aug 16, 2023
* fix tcpdump issue in bgp update timer testing
wangxin pushed a commit that referenced this pull request Aug 16, 2023
Manually cherry pick #9446 into 202012 because of conflict
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Jan 25, 2024
* fix tcpdump issue in bgp update timer testing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants