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.

Sign up for GitHub

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

Jump to bottom

[GCU E2E Testing] Update RDMA GCU E2E Tests #8341

Merged
merged 8 commits into from
Jun 12, 2023
Merged

[GCU E2E Testing] Update RDMA GCU E2E Tests #8341

merged 8 commits into from
Jun 12, 2023

Conversation

isabelmsft
Copy link
Contributor

Description of PR

Summary:
Fixes # (issue)
Update GCU RDMA E2E tests to consider the RDMA platform validator check PR sonic-net/sonic-utilities#2791

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?

Due to sonic-net/sonic-utilities#2791, expected behavior of GCU E2E RDMA tests changed. This PR accounts for the expected changes in GCU RDMA scenarios.

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...........................................(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/gu_utils.py:1:1: F401 'os' imported but unused
tests/generic_config_updater/gu_utils.py:296:16: F821 undefined name 'get_gcu_field_operations_conf'
tests/generic_config_updater/gu_utils.py:326:16: F821 undefined name 'get_gcu_field_operations_conf'
tests/generic_config_updater/gu_utils.py:327:120: E261 at least two spaces before inline comment
tests/generic_config_updater/gu_utils.py:327:121: E501 line too long (179 > 120 characters)
tests/generic_config_updater/test_ecn_config_update.py:103:13: F821 undefined name 'expect_op_failure'

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>

@isabelmsft isabelmsft mentioned this pull request May 18, 2023
Merged
6 tasks
qiluo-msft pushed a commit that referenced this pull request May 19, 2023
@isabelmsft
Skip RDMA tests on specific hwsku based on support (#8343)
fa65135 
### Description of PR
Summary:
There is a dependency between E2E test improvements PR: #8341 and sonic-utilities GCU RDMA feature PR: sonic-net/sonic-utilities#2791

This PR skips the RDMA tests that will fail when the platform GCU RDMA feature PR is merged. After the GCU RDMA feature PR is merged and backported to the appropriate branch, we will revert this PR to stop skipping the E2E tests, and merge the E2E test improvements PR so that the tests will pass once the feature changes take effect.
qiluo-msft
qiluo-msft previously approved these changes May 31, 2023
View reviewed changes
@isabelmsft isabelmsft mentioned this pull request Jun 8, 2023
Merged
6 tasks
qiluo-msft
qiluo-msft reviewed Jun 8, 2023
View reviewed changes
tests/generic_config_updater/gu_utils.py Outdated
if asic_type == 'broadcom' or asic_type == 'vs':
broadcom_asics = asic_mapping["broadcom_asics"]
for asic_shorthand, hwskus in broadcom_asics.items():
if asic != "unknown":
Copy link
Contributor

@qiluo-msft qiluo-msft Jun 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

asic

The if-block is not needed. You may consider inner loop with for-else-break. #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, changed to for-else-break syntax.

@wen587
Copy link
Contributor

wen587 commented Jun 9, 2023

LGTM

@isabelmsft isabelmsft merged commit c8c8a95 into sonic-net:master Jun 12, 2023
@isabelmsft isabelmsft mentioned this pull request Jun 13, 2023
Merged
isabelmsft added a commit to isabelmsft/sonic-mgmt that referenced this pull request Jun 13, 2023
@isabelmsft
[GCU E2E Testing] Update RDMA GCU E2E Tests (sonic-net#8341)
c4a22cc 
resolve merge conflict
@mssonicbld
Copy link
Collaborator

@isabelmsft PR conflicts with 202205 branch

wangxin pushed a commit that referenced this pull request Jun 14, 2023
@isabelmsft
[GCU E2E Testing] Update RDMA GCU E2E Tests (#8341) (#8583)
e22b1fe 
Cherry-pick PR #8341 into 202205 branch, manual to resolve merge conflicts
This was referenced Jun 19, 2023
Closed
Closed
bingwang-ms added a commit that referenced this pull request Jun 19, 2023
@bingwang-ms
Revert "[GCU E2E Testing] Update RDMA GCU E2E Tests (#8341) (#8583)"
a57409f 
This reverts commit e22b1fe.
yxieca pushed a commit that referenced this pull request Jun 19, 2023
@bingwang-ms
Revert "[GCU E2E Testing] Update RDMA GCU E2E Tests (#8341) (#8583)" (#…
c0a9fd5 
…8659)

This reverts commit e22b1fe.
@isabelmsft isabelmsft mentioned this pull request Jun 23, 2023
Merged
wangxin pushed a commit that referenced this pull request Jun 29, 2023
@isabelmsft
[GCU E2E Testing] Update RDMA GCU E2E Tests cherry-pick into 202205 (#…
ac5236d 
…8702)

Cherry-pick PR #8341 into 202205 branch, manual to resolve merge conflicts
mrkcmo pushed a commit to Azarack/sonic-mgmt that referenced this pull request Oct 3, 2023
@isabelmsft @parmarkj
Skip RDMA tests on specific hwsku based on support (sonic-net#8343)
e71fa9c 
### Description of PR
Summary:
There is a dependency between E2E test improvements PR: sonic-net#8341 and sonic-utilities GCU RDMA feature PR: sonic-net/sonic-utilities#2791

This PR skips the RDMA tests that will fail when the platform GCU RDMA feature PR is merged. After the GCU RDMA feature PR is merged and backported to the appropriate branch, we will revert this PR to stop skipping the E2E tests, and merge the E2E test improvements PR so that the tests will pass once the feature changes take effect.
mrkcmo pushed a commit to Azarack/sonic-mgmt that referenced this pull request Oct 3, 2023
@isabelmsft @parmarkj
[GCU E2E Testing] Update RDMA GCU E2E Tests (sonic-net#8341)
763c82b
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Jan 25, 2024
@isabelmsft @AharonMalkin
Skip RDMA tests on specific hwsku based on support (sonic-net#8343)
75e2225 
### Description of PR
Summary:
There is a dependency between E2E test improvements PR: sonic-net#8341 and sonic-utilities GCU RDMA feature PR: sonic-net/sonic-utilities#2791

This PR skips the RDMA tests that will fail when the platform GCU RDMA feature PR is merged. After the GCU RDMA feature PR is merged and backported to the appropriate branch, we will revert this PR to stop skipping the E2E tests, and merge the E2E test improvements PR so that the tests will pass once the feature changes take effect.
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Jan 25, 2024
@isabelmsft @AharonMalkin
[GCU E2E Testing] Update RDMA GCU E2E Tests (sonic-net#8341)
87003db
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neethajohn neethajohn neethajohn approved these changes

@qiluo-msft qiluo-msft qiluo-msft approved these changes

@wen587 wen587 Awaiting requested review from wen587

Assignees
No one assigned
Labels
Approved for 202205 branch Included in 202205 branch Request for 202205 branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@isabelmsft @mssonicbld @wen587 @qiluo-msft @neethajohn @wangxin