Enhance qos tests to support single-asic, multi-asic, and multi-dut testing#8059
Conversation
|
#7556 PR was reverted since few failures were seen. Opening this new PR to handle those issues and push the changes into 202205 branch. |
98dccea to
9b2f53f
Compare
…esting
The existing QoS (test_qos_sai.py) is written to accomodate a single asic on a single Dut.
But, we require the same tests to be executed against a T2 chassis (with single/multi-asic linecards) and multi-asic pizza boxes.
All the test cases create a list of src and dst ports. For the different modes, here is the distribution of the src and dst ports:
- single_asic: The src and dst ports are on the same asic on the same linecard.
- single_dut_multi_asic: On a multi-asic DUT/linecard, the src port is on an asic, while the dst ports are on another asic on the same DUT/linecard
- multi_dut: The src port is on an asic on one of the DUT/linecards, and the dst port is on another asic on another DUT/linecard. This is currently only required for T2 topology
Approach to accomplish this is the following:
- All the tests have to parameterized for the 3 modes defined above.
- This is done using the 'select_src_and_dst_dut_and_asic' fixture that is parameterized for 'single_asic', 'single_dut_multi_asic', 'multi_dut'
Based on the mode, it sets the src_dut_index, dst_dut_index, src_asic_index and dst_asic_index
- Added fixture 'get_src_dst_asic_and_duts' that returns dictionary of the src_dut_index, dst_dut_index, src_asic_index, and dst_asic_index,
and the src_dut and dst_dut (instances of MultiAsicSonicHost), src_asic and dst_asic (instances of Asic), and also a list of all DUTs and all Asics
- dutConfig is modified such that testPortIds and testPortIps are collecting from all the duts and asics involved and stored in a dictionary with key being the dutIndex and value being a dictionary per asic index.
- __buildTestPorts then sets the src and dst ports based on the src_dut_index, dst_dut_index, src_asic_index and dst_asic_index
- All the other fixtures and tests, we use 'get_src_dst_asci_and_duts' fixture instead of enum_rand_one_frontend_hostname and enum_frontend_index.
- The code instead the fixtures and tests is modified to the actions on the correct src/dst dut or asic.
For example:
- swap_syncd fixture would swap syncd docker on all DUT's (both src and dst) instead of just one DUT as before.
- stopServices - do it all_duts (src and dst duts)
- Similarly, changes to saitests involved dealing with multiple DUTs (and thus multiple sai clients) and modifying other data structure
like 'interface_to_front_mapping' in sai_base_test.py and port_list, sai_port_list, front_port_list in switch.py
to deal with multiple duts (modified to be dictionary with key being 'src' and 'dst')
- tests in sai_qos_tests.py pass src_dut_index, src_asic_index, dst_dut_index and dst_asic_index in the testParams.
- The saitests classes then use this to do the actions on the right client and ports.
Assumptions:
- For multi-dut, we are assuming that hwsku for all the cards are same.
… present in the output of sonic-cfggen
…ltiple DUTs defined
…alls for cisco-8000
9b2f53f to
4c4042f
Compare
judyjoseph
left a comment
There was a problem hiding this comment.
The sonic-mgmt tests is skipped in PR tester, can you trigger it again
Also add the test run for topologies if you have results saved somewhere.
|
/azp run |
|
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
@vmittal-msft, can you highlight what were the failures seen because of this change and what changes were added to this PR to fixes those |
|
@arlakshm please check the commit history. We have mainly added fixes for Mellanox as well as Cisco platforms. We used to have failures for those two SKUs. Those are passing now. |
What is the motivation for this PR? This change is to address an issue introduced by PR #8059, where hwsku might be None since caller didn't pass it in. And the check "Nokia" in hwsku causes exception. How did you do it? Protect against hwsku is None scenario. How did you verify/test it? Manually tested the new code structure when hwsku is none. Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…ti-dut testing (sonic-net#8059)" This reverts commit b1beed0.
…re (#8154) What is the motivation for this PR? QoS SAI test failed (test setup failed) due to #8059 and #8148 How did you do it? * Revert "[202205][qos] address qos helper issue (#8148)" This reverts commit 7d8f8f0. * Revert "Enhance qos tests to support single-asic, multi-asic, and multi-dut testing (#8059)" This reverts commit b1beed0.
…esting (sonic-net#8059) * Enhance qos tests to support single-asic, multi-asic, and multi-dut testing The existing QoS (test_qos_sai.py) is written to accomodate a single asic on a single Dut. But, we require the same tests to be executed against a T2 chassis (with single/multi-asic linecards) and multi-asic pizza boxes. All the test cases create a list of src and dst ports. For the different modes, here is the distribution of the src and dst ports: - single_asic: The src and dst ports are on the same asic on the same linecard. - single_dut_multi_asic: On a multi-asic DUT/linecard, the src port is on an asic, while the dst ports are on another asic on the same DUT/linecard - multi_dut: The src port is on an asic on one of the DUT/linecards, and the dst port is on another asic on another DUT/linecard. This is currently only required for T2 topology Approach to accomplish this is the following: - All the tests have to parameterized for the 3 modes defined above. - This is done using the 'select_src_and_dst_dut_and_asic' fixture that is parameterized for 'single_asic', 'single_dut_multi_asic', 'multi_dut' Based on the mode, it sets the src_dut_index, dst_dut_index, src_asic_index and dst_asic_index - Added fixture 'get_src_dst_asic_and_duts' that returns dictionary of the src_dut_index, dst_dut_index, src_asic_index, and dst_asic_index, and the src_dut and dst_dut (instances of MultiAsicSonicHost), src_asic and dst_asic (instances of Asic), and also a list of all DUTs and all Asics - dutConfig is modified such that testPortIds and testPortIps are collecting from all the duts and asics involved and stored in a dictionary with key being the dutIndex and value being a dictionary per asic index. - __buildTestPorts then sets the src and dst ports based on the src_dut_index, dst_dut_index, src_asic_index and dst_asic_index - All the other fixtures and tests, we use 'get_src_dst_asci_and_duts' fixture instead of enum_rand_one_frontend_hostname and enum_frontend_index. - The code instead the fixtures and tests is modified to the actions on the correct src/dst dut or asic. For example: - swap_syncd fixture would swap syncd docker on all DUT's (both src and dst) instead of just one DUT as before. - stopServices - do it all_duts (src and dst duts) - Similarly, changes to saitests involved dealing with multiple DUTs (and thus multiple sai clients) and modifying other data structure like 'interface_to_front_mapping' in sai_base_test.py and port_list, sai_port_list, front_port_list in switch.py to deal with multiple duts (modified to be dictionary with key being 'src' and 'dst') - tests in sai_qos_tests.py pass src_dut_index, src_asic_index, dst_dut_index and dst_asic_index in the testParams. - The saitests classes then use this to do the actions on the right client and ports. Assumptions: - For multi-dut, we are assuming that hwsku for all the cards are same. * Fixes to QoS tests for mellanox and cisco-8000 platforms * Fix json.loads exception in dut_qos_maps if corresponding data is not present in the output of sonic-cfggen * Fix to allow tests to run one a single DUT in the testbed that has multiple DUTs defined * Fixed missing 'target' parameter in sai_thrift_read_queue_occupancy calls for cisco-8000 * Fixes for T0 topology tests * Fixes for Mellanox platforms --------- Co-authored-by: sanmalho <sandeep.malhotra@nokia.com>
Description of PR
Summary:
Fixes # (issue)
This is same as PR #6946 from 'master' branch that can't be cherry-picked without merge conflicts into '202205' branch.
The existing QoS (test_qos_sai.py) is written to accomodata a single asic on a single Dut. But, we require the same tests to be executed against a T2 chassis (with single/multi-asic linecards) and multi-asic pizza boxes.
Type of change
Back port request
Approach
What is the motivation for this PR?
All the test cases create a list of src and dst ports. For the different modes, here is the distribution of the src and dst ports:
How did you do it?
Approach to accomplish this is the following:
All the tests have to parameterized for the 3 modes defined above.
dutConfig is modified such that testPortIds and testPortIps are collecting from all the duts and asics involved and stored in a dictionary with key being the dutIndex and value being a dictionary per asic index.
All the other fixtures and tests, we use 'get_src_dst_asci_and_duts' fixture instead of enum_rand_one_frontend_hostname and enum_frontend_index.
Similarly, changes to saitests involved dealing with multiple DUTs (and thus multiple sai clients) and modifying other data structure like 'interface_to_front_mapping' in sai_base_test.py and port_list, sai_port_list, front_port_list in switch.py to deal with multiple duts (modified to be dictionary with key being 'src' and 'dst')
Assumptions:
How did you verify/test it?
Verified these changes on SONIC T0/T1/T2 topologies for different vendors HWSKUs
Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation