Skip to content

[sub_port] [backend] Update acl template based on the test ports#6556

Merged
neethajohn merged 1 commit intosonic-net:masterfrom
neethajohn:sub_port_acl_update
Oct 18, 2022
Merged

[sub_port] [backend] Update acl template based on the test ports#6556
neethajohn merged 1 commit intosonic-net:masterfrom
neethajohn:sub_port_acl_update

Conversation

@neethajohn
Copy link
Contributor

@neethajohn neethajohn commented Oct 18, 2022

Signed-off-by: Neetha John [email protected]

Description of PR

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?

For storage backend, new backend acl was added (sonic-net/sonic-utilities#2236). This caused regression for sub port testcases running on 't0-backend' topology. Modified the testcase to update the acl template based on the selected test ports

How did you verify/test it?

Ran the sub port testcases with the change and they passed

@neethajohn neethajohn requested a review from lolyu October 18, 2022 00:39
@azure-pipelines
Copy link

azure-pipelines bot commented Oct 18, 2022

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.................................................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/sub_port_interfaces/conftest.py:58:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:63:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:71:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:73:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:74:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:75:8: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:77:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:79:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:80:8: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:82:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:138:121: E501 line too long (127 > 120 characters)
...
[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>

@neethajohn neethajohn requested a review from yejianquan October 18, 2022 00:40
yejianquan
yejianquan approved these changes Oct 18, 2022
View reviewed changes
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

@yejianquan
Copy link
Collaborator

yejianquan commented Oct 18, 2022

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Oct 18, 2022

Azure Pipelines successfully started running 1 pipeline(s).

@azure-pipelines
Copy link

azure-pipelines bot commented Oct 18, 2022

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.................................................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/sub_port_interfaces/conftest.py:58:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:63:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:71:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:73:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:74:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:75:8: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:77:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:79:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:80:8: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:82:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:138:121: E501 line too long (127 > 120 characters)
...
[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>

@yejianquan
Copy link
Collaborator

yejianquan commented Oct 18, 2022

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Oct 18, 2022

Azure Pipelines successfully started running 1 pipeline(s).

@azure-pipelines
Copy link

azure-pipelines bot commented Oct 18, 2022

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.................................................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/sub_port_interfaces/conftest.py:58:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:63:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:71:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:73:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:74:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:75:8: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:77:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:79:4: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:80:8: E111 indentation is not a multiple of 4
tests/sub_port_interfaces/conftest.py:82:1: E302 expected 2 blank lines, found 1
tests/sub_port_interfaces/conftest.py:138:121: E501 line too long (127 > 120 characters)
...
[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>

@neethajohn neethajohn merged commit 5ead051 into sonic-net:master Oct 18, 2022
@neethajohn neethajohn deleted the sub_port_acl_update branch October 18, 2022 16:57
wangxin pushed a commit that referenced this pull request Oct 21, 2022
@neethajohn @wangxin
[sub_port] [backend] Update acl template based on the test ports (#6556)
493c96c 
Signed-off-by: Neetha John <[email protected]>

What is the motivation for this PR?
For storage backend, new backend acl was added (sonic-net/sonic-utilities#2236). This caused regression for sub port testcases running on 't0-backend' topology. Modified the testcase to update the acl template based on the selected test ports

How did you verify/test it?
Ran the sub port testcases with the change and they passed
wangxin pushed a commit that referenced this pull request Oct 21, 2022
@neethajohn @wangxin
[sub_port] [backend] Update acl template based on the test ports (#6556)
0a08d14 
Signed-off-by: Neetha John <[email protected]>

What is the motivation for this PR?
For storage backend, new backend acl was added (sonic-net/sonic-utilities#2236). This caused regression for sub port testcases running on 't0-backend' topology. Modified the testcase to update the acl template based on the selected test ports

How did you verify/test it?
Ran the sub port testcases with the change and they passed
allen-xf pushed a commit to allen-xf/sonic-mgmt that referenced this pull request Oct 28, 2022
@neethajohn
[sub_port] [backend] Update acl template based on the test ports (son…
2faaeec 
…ic-net#6556)

Signed-off-by: Neetha John <[email protected]>

What is the motivation for this PR?
For storage backend, new backend acl was added (sonic-net/sonic-utilities#2236). This caused regression for sub port testcases running on 't0-backend' topology. Modified the testcase to update the acl template based on the selected test ports

How did you verify/test it?
Ran the sub port testcases with the change and they passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yejianquan yejianquan yejianquan approved these changes

@lolyu lolyu Awaiting requested review from lolyu

Assignees

No one assigned

Labels

Enhancement Included in 202012 branch Included in 202205 branch Request for 202012 branch Request for 202205 branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@neethajohn @yejianquan @wangxin