[202012 qos] enable dynamic compensation for PGSharedWatermarkTest, and output more info for test report by XuChen-MSFT · Pull Request #7140 · sonic-net/sonic-mgmt

XuChen-MSFT · 2022-12-31T10:22:07Z

…compensation

Description of PR

Summary:

enable dynamic compensation for PGSharedWatermarkTest, and output more info for test report

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?

Dynamically compensate leakout packet in PGSharedWatermarkTest test.
add more output in test report for debug purpose

How did you do it?

enable dynamic compensation
output more statistic in test report.

How did you verify/test it?

pass local tests.
show statistics info like below:

"+---------------+--------------+-------------+--------------+--------------+---------------+-------------+------------+---------------+----------------+------------+-------------+------------------+", 
"|               | 0 OutDiscard | 1 InDiscard | 12 InDropPkt | 0 OutDiscard | 13 OutDropPkt | 11 OutUcPkt | 14 InUcPkt | 15 InNonUcPkt | 16 OutNonUcPkt | 17 OutQlen | Ing Pg0 Pkt | Ing Pg0 Share Wm |", 
"+---------------+--------------+-------------+--------------+--------------+---------------+-------------+------------+---------------+----------------+------------+-------------+------------------+", 
"| base src port |      0       |      0      |      0       |      0       |       0       |     2172    |   84261    |       1       |       19       |     0      |    84260    |     21276928     |", 
"|      src port |      0       |      0      |      0       |      0       |       0       |     2172    |   84261    |       1       |       19       |     0      |    84261    |     21276928     |", 
"| base dst port |     1115     |      0      |      0       |     1115     |      1115     |    85317    |     0      |       1       |       21       |     0      |      0      |        0         |", 
"|      dst port |     1115     |      0      |      0       |     1115     |      1115     |    85317    |     0      |       1       |       21       |     0      |      0      |        0         |", 
"+---------------+--------------+-------------+--------------+--------------+---------------+-------------+------------+---------------+----------------+------------+-------------+------------------+",

Any platform specific information?

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

Documentation

…compensation

ZhaohuiS

LGTM

…et#7154

…esting (sandeep: PR#6946) Cleanup for QoS Minor fixes for Qos tests Changes to support QoS multi-asic and ixes to QoS tests for single-asic - Ignoring qos/test_buffer.py for T2 and allowing to run test_qos_sai.py on our chassis - Changes to support QoS multi-asic Run only single-asic QoS tests Integrating cint calls into qos tests Fixes for QoS multi-asic support qos masic - docker services should be updated on both src and dst asics it was being done only on the src asic More fixes for QoS tests Adding missing import of 'socket' to sai_qos_base.py file More fixes to QoS tests based on PR creation Final fixes for Qos tests with rebase Fixes for multi-dut and multi-asic in ReleaseAllPorts Adding missing texttable.py file needed for QoS tests Fixing typo in QoS tests Embedding 'show counter' calls in PgSharedWatermark qos test Adding missing QoS file Fixing select fixture for QoS test Fixing the path used for docker-sync-rpc image for QoS tests qos tuning for LossyQueue parameter Fixes for PFCXon test QoS changes after rebase double commit PR sonic-net#7109 sonic-net#7119 sonic-net#7140 sonic-net#7154 (sonic-net#7173) Changes to DscpToPgmapping and PgSharedWatermarkTest for qos Updating cint scripts and validating successfully executed Adding sleep before checking stats for QoS tests Change PgSharedWatermark_test assert stmt More fixes for QoS tests Fixes for QoS QSharedWatermarkTest test Need to ignore one of the asserts as SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES is not supported on DNX Enabling multi-asic/multi-dut and single-asic mode for QoS tests All the fixes are in libsai that comes with 202205 - so we can run all the tests in our weekend pipeline QoS rebase fixes Removing ptf_dut_ip - internal Nokia related code Fixing issue created via rebase Latest fixes

…esting (sandeep: PR#6946) Cleanup for QoS Minor fixes for Qos tests Changes to support QoS multi-asic and ixes to QoS tests for single-asic - Ignoring qos/test_buffer.py for T2 and allowing to run test_qos_sai.py on our chassis - Changes to support QoS multi-asic Run only single-asic QoS tests Integrating cint calls into qos tests Fixes for QoS multi-asic support qos masic - docker services should be updated on both src and dst asics it was being done only on the src asic More fixes for QoS tests Adding missing import of 'socket' to sai_qos_base.py file More fixes to QoS tests based on PR creation Final fixes for Qos tests with rebase Fixes for multi-dut and multi-asic in ReleaseAllPorts Adding missing texttable.py file needed for QoS tests Fixing typo in QoS tests Embedding 'show counter' calls in PgSharedWatermark qos test Adding missing QoS file Fixing select fixture for QoS test Fixing the path used for docker-sync-rpc image for QoS tests qos tuning for LossyQueue parameter Fixes for PFCXon test QoS changes after rebase double commit PR sonic-net#7109 sonic-net#7119 sonic-net#7140 sonic-net#7154 (sonic-net#7173) Changes to DscpToPgmapping and PgSharedWatermarkTest for qos Updating cint scripts and validating successfully executed Adding sleep before checking stats for QoS tests Change PgSharedWatermark_test assert stmt More fixes for QoS tests Fixes for QoS QSharedWatermarkTest test Need to ignore one of the asserts as SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES is not supported on DNX Enabling multi-asic/multi-dut and single-asic mode for QoS tests All the fixes are in libsai that comes with 202205 - so we can run all the tests in our weekend pipeline Fixing rebase issues Fixing rebase issues with QoS tests Fixing QoS rebase Since the static testPortIds from qos.yml is not used for testQosHeadroomPoolSize,correctPortIds function is no longer required to validate the src/dst port.Hence removed Fixing QoS tests QoS rebase fixes Merge from PR

…esting (sandeep: PR#6946) Cleanup for QoS Minor fixes for Qos tests Changes to support QoS multi-asic and ixes to QoS tests for single-asic - Ignoring qos/test_buffer.py for T2 and allowing to run test_qos_sai.py on our chassis - Changes to support QoS multi-asic Run only single-asic QoS tests Integrating cint calls into qos tests Fixes for QoS multi-asic support qos masic - docker services should be updated on both src and dst asics it was being done only on the src asic More fixes for QoS tests Adding missing import of 'socket' to sai_qos_base.py file More fixes to QoS tests based on PR creation Final fixes for Qos tests with rebase Fixes for multi-dut and multi-asic in ReleaseAllPorts Adding missing texttable.py file needed for QoS tests Fixing typo in QoS tests Embedding 'show counter' calls in PgSharedWatermark qos test Adding missing QoS file Fixing select fixture for QoS test Fixing the path used for docker-sync-rpc image for QoS tests qos tuning for LossyQueue parameter Fixes for PFCXon test QoS changes after rebase double commit PR sonic-net#7109 sonic-net#7119 sonic-net#7140 sonic-net#7154 (sonic-net#7173) Changes to DscpToPgmapping and PgSharedWatermarkTest for qos Updating cint scripts and validating successfully executed Adding sleep before checking stats for QoS tests Change PgSharedWatermark_test assert stmt More fixes for QoS tests Fixes for QoS QSharedWatermarkTest test Need to ignore one of the asserts as SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES is not supported on DNX Enabling multi-asic/multi-dut and single-asic mode for QoS tests All the fixes are in libsai that comes with 202205 - so we can run all the tests in our weekend pipeline QoS rebase fixes Removing ptf_dut_ip - internal Nokia related code Fixing issue created via rebase Latest fixes 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 Mellanox platforms fixed indentation error fixed precheck errors fixed pre-check errors fix for tests

…esting (#8149) * Enhance qos tests to support single-asic, multi-asic, and multi-dut testing (sandeep: PR#6946) Cleanup for QoS Minor fixes for Qos tests Changes to support QoS multi-asic and ixes to QoS tests for single-asic - Ignoring qos/test_buffer.py for T2 and allowing to run test_qos_sai.py on our chassis - Changes to support QoS multi-asic Run only single-asic QoS tests Integrating cint calls into qos tests Fixes for QoS multi-asic support qos masic - docker services should be updated on both src and dst asics it was being done only on the src asic More fixes for QoS tests Adding missing import of 'socket' to sai_qos_base.py file More fixes to QoS tests based on PR creation Final fixes for Qos tests with rebase Fixes for multi-dut and multi-asic in ReleaseAllPorts Adding missing texttable.py file needed for QoS tests Fixing typo in QoS tests Embedding 'show counter' calls in PgSharedWatermark qos test Adding missing QoS file Fixing select fixture for QoS test Fixing the path used for docker-sync-rpc image for QoS tests qos tuning for LossyQueue parameter Fixes for PFCXon test QoS changes after rebase double commit PR #7109 #7119 #7140 #7154 (#7173) Changes to DscpToPgmapping and PgSharedWatermarkTest for qos Updating cint scripts and validating successfully executed Adding sleep before checking stats for QoS tests Change PgSharedWatermark_test assert stmt More fixes for QoS tests Fixes for QoS QSharedWatermarkTest test Need to ignore one of the asserts as SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES is not supported on DNX Enabling multi-asic/multi-dut and single-asic mode for QoS tests All the fixes are in libsai that comes with 202205 - so we can run all the tests in our weekend pipeline QoS rebase fixes Removing ptf_dut_ip - internal Nokia related code Fixing issue created via rebase Latest fixes 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 Mellanox platforms fixed indentation error fixed precheck errors fixed pre-check errors fix for tests * Fixes from 202205 branch * Fixes for ToR QoS test cases * Fix for nightly failures * Fix for nightly failures-2 * dual tor fixes * dual tor fixes - 2 * dual tor fixes - 3 * pre-check fixes * pre-check fixes - 2 * pre-check fixes - 3 * pre-check fixes - 4 * pre-check fixes - 5 * pre-check fixes 6 * pre-check fixes 7 --------- Co-authored-by: sanmalho <sandeep.malhotra@nokia.com>

…esting (sonic-net#8149) * Enhance qos tests to support single-asic, multi-asic, and multi-dut testing (sandeep: PR#6946) Cleanup for QoS Minor fixes for Qos tests Changes to support QoS multi-asic and ixes to QoS tests for single-asic - Ignoring qos/test_buffer.py for T2 and allowing to run test_qos_sai.py on our chassis - Changes to support QoS multi-asic Run only single-asic QoS tests Integrating cint calls into qos tests Fixes for QoS multi-asic support qos masic - docker services should be updated on both src and dst asics it was being done only on the src asic More fixes for QoS tests Adding missing import of 'socket' to sai_qos_base.py file More fixes to QoS tests based on PR creation Final fixes for Qos tests with rebase Fixes for multi-dut and multi-asic in ReleaseAllPorts Adding missing texttable.py file needed for QoS tests Fixing typo in QoS tests Embedding 'show counter' calls in PgSharedWatermark qos test Adding missing QoS file Fixing select fixture for QoS test Fixing the path used for docker-sync-rpc image for QoS tests qos tuning for LossyQueue parameter Fixes for PFCXon test QoS changes after rebase double commit PR sonic-net#7109 sonic-net#7119 sonic-net#7140 sonic-net#7154 (sonic-net#7173) Changes to DscpToPgmapping and PgSharedWatermarkTest for qos Updating cint scripts and validating successfully executed Adding sleep before checking stats for QoS tests Change PgSharedWatermark_test assert stmt More fixes for QoS tests Fixes for QoS QSharedWatermarkTest test Need to ignore one of the asserts as SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES is not supported on DNX Enabling multi-asic/multi-dut and single-asic mode for QoS tests All the fixes are in libsai that comes with 202205 - so we can run all the tests in our weekend pipeline QoS rebase fixes Removing ptf_dut_ip - internal Nokia related code Fixing issue created via rebase Latest fixes 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 Mellanox platforms fixed indentation error fixed precheck errors fixed pre-check errors fix for tests * Fixes from 202205 branch * Fixes for ToR QoS test cases * Fix for nightly failures * Fix for nightly failures-2 * dual tor fixes * dual tor fixes - 2 * dual tor fixes - 3 * pre-check fixes * pre-check fixes - 2 * pre-check fixes - 3 * pre-check fixes - 4 * pre-check fixes - 5 * pre-check fixes 6 * pre-check fixes 7 --------- Co-authored-by: sanmalho <sandeep.malhotra@nokia.com>

PGSharedWatermarkTest: add more info for test report, enable dynamic …

c0b44b2

…compensation

XuChen-MSFT requested review from StormLiangMS, ZhaohuiS and neethajohn December 31, 2022 10:22

ZhaohuiS approved these changes Jan 2, 2023

View reviewed changes

XuChen-MSFT merged commit 44a037d into sonic-net:202012 Jan 2, 2023

XuChen-MSFT added a commit to XuChen-MSFT/sonic-mgmt that referenced this pull request Jan 4, 2023

double commit PR sonic-net#7109 sonic-net#7119 sonic-net#7140 sonic-n…

c29f850

…et#7154

XuChen-MSFT mentioned this pull request Jan 5, 2023

[qos master/202205] double commit headroom and watermark qos test PR #7109 #7119 #7140 #7154 #7173

Merged

6 tasks

XuChen-MSFT added a commit that referenced this pull request Jan 5, 2023

double commit PR #7109 #7119 #7140 #7154 (#7173)

da3c57e

wangxin pushed a commit that referenced this pull request Jan 6, 2023

double commit PR #7109 #7119 #7140 #7154 (#7173)

583dcbe

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[202012 qos] enable dynamic compensation for PGSharedWatermarkTest, and output more info for test report#7140

[202012 qos] enable dynamic compensation for PGSharedWatermarkTest, and output more info for test report#7140
XuChen-MSFT merged 1 commit intosonic-net:202012from
XuChen-MSFT:xuchen3/202012/PGSharedWatermarkTest-lossless

XuChen-MSFT commented Dec 31, 2022

Uh oh!

ZhaohuiS left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

XuChen-MSFT commented Dec 31, 2022

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!

ZhaohuiS left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants