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

[T2][macsec] Fixes to tests for running them with macsec enabled topology #15905

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

judyjoseph
Copy link
Contributor

Description of PR

Summary:
Fixes # (issue)

Type of change

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

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405

Approach

What is the motivation for this PR?

To add

How did you do it?

How did you verify/test it?

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...............................................................Passed
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

ansible/roles/test/files/ptftests/fib_test.py:264:49: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/fib_test.py:268:105: E502 the backslash is redundant between brackets
ansible/roles/test/files/ptftests/fib_test.py:269:17: E128 continuation line under-indented for visual indent
ansible/roles/test/files/ptftests/fib_test.py:279:121: E501 line too long (122 > 120 characters)
ansible/roles/test/files/ptftests/fib_test.py:281:53: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/py3/IP_decap_test.py:497:15: E275 missing whitespace after keyword
ansible/roles/test/files/ptftests/py3/IP_decap_test.py:569:49: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/py3/hash_test.py:136:15: E275 missing whitespace after keyword
ansible/roles/test/files/ptftests/py3/hash_test.py:195:45: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/py3/hash_test.py:813:45: E711 comparison to None should be 'if cond is None:'
tests/common/macsec/macsec_config_helper.py:4:121: E501 line too long (135 > 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>

@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...............................................................Passed
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

ansible/roles/test/files/ptftests/fib_test.py:264:49: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/fib_test.py:268:105: E502 the backslash is redundant between brackets
ansible/roles/test/files/ptftests/fib_test.py:269:17: E128 continuation line under-indented for visual indent
ansible/roles/test/files/ptftests/fib_test.py:279:121: E501 line too long (122 > 120 characters)
ansible/roles/test/files/ptftests/fib_test.py:281:53: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/py3/IP_decap_test.py:497:15: E275 missing whitespace after keyword
ansible/roles/test/files/ptftests/py3/IP_decap_test.py:569:49: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/py3/hash_test.py:136:15: E275 missing whitespace after keyword
ansible/roles/test/files/ptftests/py3/hash_test.py:195:45: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/py3/hash_test.py:813:45: E711 comparison to None should be 'if cond is None:'
tests/common/macsec/macsec_config_helper.py:4:121: E501 line too long (135 > 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>

@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...............................................................Passed
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

ansible/roles/test/files/ptftests/fib_test.py:264:49: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/fib_test.py:268:105: E502 the backslash is redundant between brackets
ansible/roles/test/files/ptftests/fib_test.py:269:17: E128 continuation line under-indented for visual indent
ansible/roles/test/files/ptftests/fib_test.py:279:121: E501 line too long (122 > 120 characters)
ansible/roles/test/files/ptftests/fib_test.py:281:53: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/py3/IP_decap_test.py:497:15: E275 missing whitespace after keyword
ansible/roles/test/files/ptftests/py3/IP_decap_test.py:569:49: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/py3/hash_test.py:136:15: E275 missing whitespace after keyword
ansible/roles/test/files/ptftests/py3/hash_test.py:195:45: E711 comparison to None should be 'if cond is None:'
ansible/roles/test/files/ptftests/py3/hash_test.py:813:45: E711 comparison to None should be 'if cond is None:'
tests/common/macsec/macsec_config_helper.py:4:121: E501 line too long (135 > 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>

@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...............................................................Passed
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

tests/common/macsec/macsec_config_helper.py:31:1: E302 expected 2 blank lines, found 1
tests/common/macsec/macsec_config_helper.py:36:1: E302 expected 2 blank lines, found 1
tests/common/macsec/macsec_helper.py:480:121: E501 line too long (128 > 120 characters)
tests/common/macsec/macsec_helper.py:481:121: E501 line too long (132 > 120 characters)
tests/common/macsec/macsec_helper.py:484:121: E501 line too long (134 > 120 characters)
tests/common/macsec/macsec_helper.py:485:121: E501 line too long (145 > 120 characters)
tests/common/macsec/macsec_helper.py:486:121: E501 line too long (136 > 120 characters)
tests/common/macsec/macsec_helper.py:487:121: E501 line too long (124 > 120 characters)
tests/everflow/test_everflow_testbed.py:150:17: E117 over-indented
tests/everflow/test_everflow_testbed.py:247:17: E117 over-indented
tests/everflow/test_everflow_testbed.py:320:17: E117 over-indented
...
[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>

@sonic-net sonic-net deleted a comment from mssonicbld Dec 5, 2024
@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...............................................................Failed
- hook id: check-yaml
- exit code: 1

while constructing a mapping
in "tests/common/plugins/conditional_mark/tests_mark_conditions.yaml", line 4, column 1
found duplicate key "qos" with value "{}" (original value: "{}")
in "tests/common/plugins/conditional_mark/tests_mark_conditions.yaml", line 1405, column 1

To suppress this check see:
http://yaml.readthedocs.io/en/latest/api.html#duplicate-keys

check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Passed
flake8...............................................(no files to check)Skipped
check conditional mark sort..............................................Failed
- hook id: check-conditional-mark-sort
...
[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>

@judyjoseph judyjoseph changed the title [T2][macsec] Updates to tests for running them in macsec enabled topology [T2][macsec] Fixes to tests for running them with macsec enabled topology Dec 6, 2024
@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...............................................................Failed
- hook id: check-yaml
- exit code: 1

while constructing a mapping
in "tests/common/plugins/conditional_mark/tests_mark_conditions.yaml", line 4, column 1
found duplicate key "qos" with value "{}" (original value: "{}")
in "tests/common/plugins/conditional_mark/tests_mark_conditions.yaml", line 1405, column 1

To suppress this check see:
http://yaml.readthedocs.io/en/latest/api.html#duplicate-keys

check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Passed
flake8...............................................(no files to check)Skipped
check conditional mark sort..............................................Failed
- hook id: check-conditional-mark-sort
...
[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>

@judyjoseph
Copy link
Contributor Author

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants