RDMA Multi-Dut/Multi-Asic Infrastructure changes by selldinesh · Pull Request #7849 · sonic-net/sonic-mgmt

selldinesh · 2023-03-24T16:54:12Z

Description of PR

Summary:
This PR contains fixtures that has the logic for customizing the port selection from ansible files based on the multi-chassis or non-chassis based port for enhanced RDMA cases based on the users input from the tests/snappi/variables.py file
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?

How did you do it?

How did you verify/test it?

Tested against Nokia Ixre7520

Any platform specific information?

The DUT configuration commands might be specific to a Vendor. If other vendor doesn't support the commands, then they can modify the DUT commands in common_helpers.py file.

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

T2

Documentation

Rdma mutiasic infra

linux-foundation-easycla · 2023-03-24T16:54:17Z

The committers listed above are authorized under a signed CLA.

✅ login: vkuma82 (4af9eaa)
✅ login: selldinesh / name: Dinesh Kumar Sellappan (76d7ad5, 10a55c2, 6ab8a28, a20f741, e52783f, 6b54da9, 3fd18c9, b271bd5, af642f6, 6573c37, 275fb9f, aa3c82b, 8db673f, b96da0f, 3b6464f, ceb3370, 2fdd175, 51d665f)
✅ login: yejianquan / name: Ye Jianquan (af642f6)
✅ login: vikumarks (6faa6d5)
✅ login: dks0692 (aefd5b7, f71e1ca, 674d115, 639d65b, 9b32c12, 5be423f, 356b488, a50fa3c, 3c6932f, a1544cd, 3e73432, 5681632, 4736eec, 276f703)

mssonicbld · 2023-03-24T16:55:18Z

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/common/snappi/snappi_fixtures.py:580:31: F811 redefinition of unused 'conn_graph_facts' from line 10 tests/common/snappi/snappi_fixtures.py:581:31: F811 redefinition of unused 'fanout_graph_facts' from line 10 tests/common/snappi/snappi_fixtures.py:602:13: F841 local variable 'snappi_fanout' is assigned to but never used tests/common/snappi/snappi_fixtures.py:761:34: F811 redefinition of unused 'conn_graph_facts' from line 10 tests/common/snappi/snappi_fixtures.py:842:23: F821 undefined name 'unicode' tests/common/snappi/snappi_fixtures.py:844:34: F821 undefined name 'unicode' tests/common/snappi/snappi_fixtures.py:845:25: F821 undefined name 'unicode' tests/common/snappi/snappi_fixtures.py:849:34: F821 undefined name 'unicode' tests/snappi/test_multidut_snappi.py:5:1: F401 'tests.common.fixtures.conn_graph_facts.conn_graph_facts' imported but unused tests/snappi/test_multidut_snappi.py:5:1: F401 'tests.common.fixtures.conn_graph_facts.fanout_graph_facts' imported but unused tests/snappi/test_multidut_snappi.py:7:1: F401 'tests.common.snappi.snappi_fixtures.snappi_api_serv_ip' imported but unused ... [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:

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.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

mssonicbld · 2023-03-28T19:32:07Z

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/common/snappi/snappi_fixtures.py:580:31: F811 redefinition of unused 'conn_graph_facts' from line 10 tests/common/snappi/snappi_fixtures.py:581:31: F811 redefinition of unused 'fanout_graph_facts' from line 10 tests/common/snappi/snappi_fixtures.py:602:13: F841 local variable 'snappi_fanout' is assigned to but never used tests/common/snappi/snappi_fixtures.py:761:34: F811 redefinition of unused 'conn_graph_facts' from line 10 tests/common/snappi/snappi_fixtures.py:842:23: F821 undefined name 'unicode' tests/common/snappi/snappi_fixtures.py:844:34: F821 undefined name 'unicode' tests/common/snappi/snappi_fixtures.py:845:25: F821 undefined name 'unicode' tests/common/snappi/snappi_fixtures.py:849:34: F821 undefined name 'unicode' tests/snappi/test_multidut_snappi.py:5:1: F401 'tests.common.fixtures.conn_graph_facts.conn_graph_facts' imported but unused tests/snappi/test_multidut_snappi.py:5:1: F401 'tests.common.fixtures.conn_graph_facts.fanout_graph_facts' imported but unused tests/snappi/test_multidut_snappi.py:7:1: F401 'tests.common.snappi.snappi_fixtures.snappi_api_serv_ip' imported but unused ... [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:

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.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

Rdma mutiasic infra

mssonicbld · 2023-03-29T02:18:09Z

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/common/snappi/common_helpers.py:513:1: E302 expected 2 blank lines, found 1

To run the pre-commit checks locally, you can follow below steps:

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.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

* Fix "logging not defined" issue of some snappi tests (sonic-net#7855) What is the motivation for this PR? The logging module is used by some files under tests.snappi. However, the module is not imported in the files. This caused error like below while collecting the snappi tests: E NameError: name 'logging' is not defined How did you do it? The fix is to import logging in those files. Signed-off-by: Xin Wang <[email protected]> * [Python3 migration]Fix oid issue in snmp_pdu_controllers.py sonic-net#7887 What is the motivation for this PR? In Python2, oid.prettyPrint() prints 1.3.6.1.4.1.9.1.283 In Python3, oid.prettyPrint() prints SNMPv2-SMI::enterprises.9.1.283 This difference breaks port_label_dict in _build_outlet_maps() in snmp_pdu_controllers.py How did you do it? Change oid.prettyPrint() to str(oid). This will make code work both in Python2 and Python3. How did you verify/test it? PDU testcase can run manually both in Python2 and Python3. * Fix pdu KeyError for pdu_controller fixture (sonic-net#7876) What is the motivation for this PR? PR sonic-net#7782 updated the pdu_manager_factory interface. Only devutils using this function was updated accordingly. Fixtures like pdu_controller using this function also need to be updated. How did you do it? This PR updated the pdu_controller and get_pdu_controller fixtures accordingly to pass correct PDU variables to the pdu_manager_factory function. This change only can fix the issue under python2. Under python3, the pysnmp package version 4.4.12 is much higher than the 4.2.5 package used in python2. The newer package has compatibility issues. The current snmp_pdu_controllers.py script needs to be updated for python3. That issue is fixed in sonic-net#7887 Signed-off-by: Xin Wang <[email protected]> * Make test_plan.py compatible between python2 and python3 (sonic-net#7886) * Make test_plan.py compatible between python2 and python3 Approach What is the motivation for this PR? Make test_plan.py compatible between python2 and python3 co-authorized by: [email protected] * RDMA pfc global pause multi dut test * Refine testbedv2 template output (sonic-net#7895) * Refine testbedv2 template output Approach What is the motivation for this PR? Refine testbedv2 template output Co-authorized by: [email protected] * fix test_route_perf packet verify issue (sonic-net#7877) * fix route perf failure caused by missing some port-channel members * Skip warm-reboot cases for T2. (sonic-net#7784) --------- Signed-off-by: Xin Wang <[email protected]> Co-authored-by: Xin Wang <[email protected]> Co-authored-by: ShiyanWangMS <[email protected]> Co-authored-by: Ye Jianquan <[email protected]> Co-authored-by: jcaiMR <[email protected]> Co-authored-by: rraghav-cisco <[email protected]>

tests/common/snappi/common_helpers.py

tests/common/snappi/qos_fixtures.py

tests/snappi/variables.py

tests/common/snappi/snappi_fixtures.py

wangxin · 2023-04-16T11:45:39Z

/azp run

azure-pipelines · 2023-04-16T11:45:49Z

Azure Pipelines successfully started running 1 pipeline(s).

kamalsahu0001 · 2023-04-19T17:49:44Z

Test plan for Global pause multidut test case is same as that of singledut. Below is the link for testplan.
https://github.com/sonic-net/sonic-mgmt/blob/master/docs/testplan/pfc/GLOBAL_PAUSE_README.md

tests/common/snappi/common_helpers.py

tests/common/snappi/snappi_fixtures.py

baiwei0427 · 2023-04-21T01:29:33Z

@selldinesh Can you remove PFC tests from this PR?

mssonicbld · 2023-07-21T17:27:16Z

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.................................................Failed - hook id: trailing-whitespace - exit code: 1 - files were modified by this hook Fixing tests/common/snappi/snappi_fixtures.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/snappi/snappi_fixtures.py:729:31: E711 comparison to None should be 'if cond is None:' check conditional mark sort..........................(no files to check)Skipped

To run the pre-commit checks locally, you can follow below steps:

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.
Ensure that the pre-commit package is installed:

sudo pip install pre-commit

Go to repository root folder
Install the pre-commit hooks:

pre-commit install

Use pre-commit to check staged file:

pre-commit

Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

rlhui · 2023-07-26T17:14:20Z

@developfast , would you be approving this soon? thanks.

mssonicbld · 2023-08-02T02:36:27Z

@selldinesh PR conflicts with 202305 branch

mssonicbld · 2023-08-02T02:36:30Z

@selldinesh PR conflicts with 202012 branch

mssonicbld · 2023-08-02T02:36:30Z

@selldinesh PR conflicts with 202205 branch

developfast · 2023-08-14T08:06:51Z

@selldinesh please fix all necessary conflicts for other branches and create separate PRs for them, when you get a chance.

wangxin · 2023-08-16T23:19:11Z

@developfast Do we really need this "feature" change in 202205 and 202012 branches?

developfast · 2023-08-17T03:56:38Z

@wangxin this is needed for 202205. Let me get back to you on 202012.

…frastructure (sonic-net#7849) * Added Multi Dut Multi asic Support * PreCommit Check * Update common_helpers.py * Rdma multiasic global pause (sonic-net#9) * Fix "logging not defined" issue of some snappi tests (sonic-net#7855) What is the motivation for this PR? The logging module is used by some files under tests.snappi. However, the module is not imported in the files. This caused error like below while collecting the snappi tests: E NameError: name 'logging' is not defined How did you do it? The fix is to import logging in those files. Signed-off-by: Xin Wang <[email protected]> * [Python3 migration]Fix oid issue in snmp_pdu_controllers.py sonic-net#7887 What is the motivation for this PR? In Python2, oid.prettyPrint() prints 1.3.6.1.4.1.9.1.283 In Python3, oid.prettyPrint() prints SNMPv2-SMI::enterprises.9.1.283 This difference breaks port_label_dict in _build_outlet_maps() in snmp_pdu_controllers.py How did you do it? Change oid.prettyPrint() to str(oid). This will make code work both in Python2 and Python3. How did you verify/test it? PDU testcase can run manually both in Python2 and Python3. * Fix pdu KeyError for pdu_controller fixture (sonic-net#7876) What is the motivation for this PR? PR sonic-net#7782 updated the pdu_manager_factory interface. Only devutils using this function was updated accordingly. Fixtures like pdu_controller using this function also need to be updated. How did you do it? This PR updated the pdu_controller and get_pdu_controller fixtures accordingly to pass correct PDU variables to the pdu_manager_factory function. This change only can fix the issue under python2. Under python3, the pysnmp package version 4.4.12 is much higher than the 4.2.5 package used in python2. The newer package has compatibility issues. The current snmp_pdu_controllers.py script needs to be updated for python3. That issue is fixed in sonic-net#7887 Signed-off-by: Xin Wang <[email protected]> * Make test_plan.py compatible between python2 and python3 (sonic-net#7886) * Make test_plan.py compatible between python2 and python3 Approach What is the motivation for this PR? Make test_plan.py compatible between python2 and python3 co-authorized by: [email protected] * RDMA pfc global pause multi dut test * Refine testbedv2 template output (sonic-net#7895) * Refine testbedv2 template output Approach What is the motivation for this PR? Refine testbedv2 template output Co-authorized by: [email protected] * fix test_route_perf packet verify issue (sonic-net#7877) * fix route perf failure caused by missing some port-channel members * Skip warm-reboot cases for T2. (sonic-net#7784) --------- Signed-off-by: Xin Wang <[email protected]> Co-authored-by: Xin Wang <[email protected]> Co-authored-by: ShiyanWangMS <[email protected]> Co-authored-by: Ye Jianquan <[email protected]> Co-authored-by: jcaiMR <[email protected]> Co-authored-by: rraghav-cisco <[email protected]> * removing 2nd asic value * review feedback changes * removing global pause case from infra changes * removing qos fixture from this branch * namespace to asic_value * resolving comments Signed-off-by: selldinesh <[email protected]> * resolving comments Signed-off-by: selldinesh <[email protected]> * typo fix * removing mlnx only * adding qos fixtures file back * pre commit fix * pre commit fix * changing 'None' to None * resolving precommit errors * resolving comments * adding a short description about this file * review comment fixes * removing quotes * review changes * review changes * review changes * review changes --------- Signed-off-by: Xin Wang <[email protected]> Signed-off-by: selldinesh <[email protected]> Co-authored-by: vkuma82 <[email protected]> Co-authored-by: Xin Wang <[email protected]> Co-authored-by: ShiyanWangMS <[email protected]> Co-authored-by: Ye Jianquan <[email protected]> Co-authored-by: jcaiMR <[email protected]> Co-authored-by: rraghav-cisco <[email protected]> Co-authored-by: Vinod Kumar <[email protected]> Co-authored-by: selldinesh <[email protected]>

amitpawar12 · 2024-03-20T20:51:02Z

Currently the cleanup_config called at the end of the each testcase will not called/work if the run_xyz_test or any other function in the testcase asserts. We have to manually remove the assigned IP-addresses on the DUT. This is a problem if we are executing series of testcases and there is a testcase failure.

We need to modify the cleanup_config function as a pytest.fixture to be called irrespective of the testcase execution result.

vkuma82 and others added 3 commits March 23, 2023 20:43

Added Multi Dut Multi asic Support

4af9eaa

Merge branch 'sonic-net:master' into rdma_mutiasic_infra

76d7ad5

Merge pull request #7 from selldinesh/rdma_mutiasic_infra

10a55c2

Rdma mutiasic infra

kamalsahu0001 mentioned this pull request Mar 27, 2023

RDMA case modification to support Multi-ASIC Feature #7410

Closed

6 tasks

Merge branch 'sonic-net:master' into master

6ab8a28

selldinesh and others added 4 commits March 28, 2023 18:51

PreCommit Check

a20f741

Merge branch 'sonic-net:master' into rdma_mutiasic_infra

e52783f

Merge branch 'master' into rdma_mutiasic_infra

6b54da9

Merge pull request #8 from selldinesh/rdma_mutiasic_infra

3fd18c9

Rdma mutiasic infra

Update common_helpers.py

b271bd5

rlhui requested a review from baiwei0427 March 29, 2023 17:18

rlhui assigned vmittal-msft and selldinesh Mar 29, 2023

selldinesh and others added 2 commits March 29, 2023 15:48

Merge branch 'sonic-net:master' into master

6573c37

baiwei0427 requested changes Mar 30, 2023

View reviewed changes

selldinesh and others added 2 commits April 4, 2023 17:52

removing 2nd asic value

275fb9f

review feedback changes

6faa6d5

baiwei0427 requested changes Apr 21, 2023

View reviewed changes

dks0692 added 3 commits May 1, 2023 16:20

removing global pause case from infra changes

aefd5b7

removing qos fixture from this branch

f71e1ca

Merge branch 'master' of https://github.com/selldinesh/sonic-mgmt

674d115

selldinesh added 2 commits July 21, 2023 17:23

review changes

3b6464f

review changes

ceb3370

review changes

2fdd175

developfast self-requested a review July 21, 2023 17:38

review changes

51d665f

developfast approved these changes Jul 28, 2023

View reviewed changes

developfast merged commit 983fc75 into sonic-net:master Jul 28, 2023

developfast added Request for 202012 branch Request for 202205 branch Request for 202305 branch labels Aug 1, 2023

wangxin added Approved for 202012 Branch Approved for 202205 branch Approved for 202305 branch labels Aug 2, 2023

mssonicbld added Cherry Pick Conflict_202305 Cherry Pick Conflict_202012 labels Aug 2, 2023

mssonicbld added the Cherry Pick Conflict_202205 label Aug 2, 2023

developfast mentioned this pull request Aug 18, 2023

[202205][snappi] cherry pick PR #7849 #9535

Closed

6 tasks

wangxin mentioned this pull request Aug 20, 2023

[202012][snappi] cherry pick PR #7849 #9536

Closed

6 tasks

vmittal-msft added the chassis label Dec 7, 2023

amitpawar12 mentioned this pull request Aug 2, 2024

[Snappi] Fix for crash in enable_packet_aging_after_test called during test cleanup #13845

Merged

8 tasks

Conversation

selldinesh commented Mar 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of PR

Type of change

Back port request

Approach

What is the motivation for this PR?

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

Uh oh!

linux-foundation-easycla bot commented Mar 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mssonicbld commented Mar 24, 2023

Uh oh!

mssonicbld commented Mar 28, 2023

Uh oh!

mssonicbld commented Mar 29, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wangxin commented Apr 16, 2023

Uh oh!

azure-pipelines bot commented Apr 16, 2023

Uh oh!

kamalsahu0001 commented Apr 19, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

baiwei0427 commented Apr 21, 2023

Uh oh!

mssonicbld commented Jul 21, 2023

Uh oh!

rlhui commented Jul 26, 2023

Uh oh!

mssonicbld commented Aug 2, 2023

Uh oh!

mssonicbld commented Aug 2, 2023

Uh oh!

mssonicbld commented Aug 2, 2023

Uh oh!

developfast commented Aug 14, 2023

Uh oh!

wangxin commented Aug 16, 2023

Uh oh!

developfast commented Aug 17, 2023

Uh oh!

amitpawar12 commented Mar 20, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

selldinesh commented Mar 24, 2023 •

edited

Loading

linux-foundation-easycla bot commented Mar 24, 2023 •

edited

Loading