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

Temporary fix for Dynamic ACL via GCU ACL rule replacement test #12515

Merged
merged 4 commits into from
Apr 19, 2024

Conversation

jongorel
Copy link
Contributor

Description of PR

Summary:

Changes test_gcu_acl_forward_rule_replacement to separate the replacement operation into two separate delete and add operations. This is to address test failures caused by a SONiC OS bug that floods error logs after a ACL rule is directly replaced in configDB, despite ACL functionality working as intended - sonic-net/sonic-buildimage#18719

Test working on testbed that it previously failed on:

image

Type of change

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

Back port request

  • 201911
  • 202012
  • 202205
  • 202305
  • 202311

Approach

What is the motivation for this PR?

Temporarily fix test case to get rid of errors in nightly testing suite pending bug fix in SONiC OS

How did you do it?

Changed the replace operation into two separate delete and add operations

How did you verify/test it?

Tested it on a testbed that had previously been failing

@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/generic_config_updater/test_dynamic_acl.py:884:5: E303 too many blank lines (2)
tests/generic_config_updater/test_dynamic_acl.py:902:5: E265 block comment should start with '# '

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>

@bingwang-ms bingwang-ms merged commit 80415ad into sonic-net:master Apr 19, 2024
14 checks passed
@bingwang-ms
Copy link
Collaborator

@yxieca Can you please help approve the cherry-pick? Thanks

mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Apr 19, 2024
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202311: #12517

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.

4 participants