Skip to content

[dualtor][utilities] confirm neighbor entry exists before checking tunnel routes#8029

Merged
zjswhhh merged 3 commits intosonic-net:masterfrom
zjswhhh:show_mux_tun_public
Apr 17, 2023
Merged

[dualtor][utilities] confirm neighbor entry exists before checking tunnel routes#8029
zjswhhh merged 3 commits intosonic-net:masterfrom
zjswhhh:show_mux_tun_public

Conversation

@zjswhhh
Copy link
Copy Markdown
Contributor

@zjswhhh zjswhhh commented Apr 13, 2023 •
edited by lolyu
Loading

Description of PR

Summary:
Fixes # (issue)

This PR is to improve dualtor_io test utilities.

sign-off: Jing Zhang zhangjing@microsoft.com

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?

Checking tunnel routes when neighbor entry is missing is meaningless.

How did you do it?

Fetch ip address from config db, then check the neighbor entry.

How did you verify/test it?

Ran test_normal_op tests on dualtor testbeds.

Any platform specific information?

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

Documentation

@zjswhhh zjswhhh requested a review from lolyu April 13, 2023 00:06
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Apr 13, 2023

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing tests/common/dualtor/control_plane_utils.py

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/common/dualtor/control_plane_utils.py:48:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:49:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:52:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:53:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:59:48: E231 missing whitespace after ':'
...
[truncated extra lines, please run pre-commit locally to view full check results]

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>

@zjswhhh zjswhhh requested a review from yxieca April 13, 2023 00:08
lolyu
lolyu reviewed Apr 13, 2023
View reviewed changes
Comment thread tests/common/dualtor/control_plane_utils.py Outdated
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Apr 13, 2023

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing tests/common/dualtor/control_plane_utils.py

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/common/dualtor/control_plane_utils.py:48:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:49:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:52:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:53:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:59:48: E231 missing whitespace after ':'
...
[truncated extra lines, please run pre-commit locally to view full check results]

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>

@zjswhhh zjswhhh requested a review from lolyu April 13, 2023 20:53
@lolyu
Copy link
Copy Markdown
Collaborator

lolyu commented Apr 16, 2023

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines Bot commented Apr 16, 2023

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Apr 16, 2023

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing tests/common/dualtor/control_plane_utils.py

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/common/dualtor/control_plane_utils.py:48:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:49:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:52:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:53:48: E231 missing whitespace after ':'
tests/common/dualtor/control_plane_utils.py:59:48: E231 missing whitespace after ':'
...
[truncated extra lines, please run pre-commit locally to view full check results]

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>

@zjswhhh zjswhhh merged commit 2c78be4 into sonic-net:master Apr 17, 2023
@zjswhhh zjswhhh deleted the show_mux_tun_public branch April 17, 2023 16:46
wangxin pushed a commit that referenced this pull request Apr 20, 2023
@zjswhhh @wangxin
[dualtor][utilities] confirm neighbor entry exists before checking tu…
5d278de 
…nnel routes (#8029)

Description of PR
Summary:
Fixes # (issue)

This PR is to improve dualtor_io test utilities.

sign-off: Jing Zhang zhangjing@microsoft.com

What is the motivation for this PR?
Checking tunnel routes when neighbor entry is missing is meaningless.

How did you do it?
Fetch ip address from config db, then check the neighbor entry.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lolyu lolyu lolyu approved these changes

@yxieca yxieca Awaiting requested review from yxieca

Assignees

No one assigned

Labels

Included in 202205 branch Request for 202205 branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@zjswhhh @mssonicbld @lolyu @wangxin