Fix qos/test_qos_dscp_mapping.py

[vkjammala-arista]

Description of PR

Summary: Fix qos/test_qos_dscp_mapping.py failures
Fixes # aristanetworks/sonic-qual.msft#132

Type of change

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

Back port request

• 201911
• 202012
• 202205
• 202305
• 202311

Approach

What is the motivation for this PR?

This test is mainly failing due to:

• Sending 10K packets at once on a ptf interface is sometimes causing nnpy socket to be non-functional for a moment and connection is getting timedout (logic to timeout is introduced by Add a send timeout to nnpy sockets. p4lang/ptf#183).
• Sometimes egress_queue_count on queue 7 is way greater than no of packets being sent and the queue_count is not within the TOLERANCE, this could be due to protocol packets.
• Test is not enhanced to be run on dualtor topologies (packets are going to unexpected ToR).
• Fixtures "upstream_links" and "downstream_links" are always referring to upper ToR, thus return values of these fixtures is not really considering the ToR type and causing failures.

How did you do it?

Fixes involve adding right fixtures to the test methods (to consider dualtor topologies) and minor changes to address above issues.

How did you verify/test it?

With the fix test is passing well (earlier it was failing most of the times with one or other reason). Verified the fix on Arista-7260CX3-C64 202311 branch.

Any platform specific information?

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

Documentation

[mssonicbld]

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/qos/test_qos_dscp_mapping.py:14:1: F401 'tests.common.dualtor.mux_simulator_control.toggle_all_simulator_ports_to_rand_selected_tor' imported but unused
tests/qos/test_qos_dscp_mapping.py:340:46: F811 redefinition of unused 'toggle_all_simulator_ports_to_rand_selected_tor' from line 14
tests/qos/test_qos_dscp_mapping.py:352:49: F811 redefinition of unused 'toggle_all_simulator_ports_to_rand_selected_tor' from line 14

flake8...............................................(no files to check)Skipped
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

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

pre-commit install

5. Use pre-commit to check staged file:

pre-commit

6. Alternatively, you can check committed files using:

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

[wsycqyz]

The pre-commit check is mandatory. Please check.

[vkjammala-arista]

The pre-commit check is mandatory. Please check.

The pre-commit check is mandatory. Please check.

Thanks took care of this.

[wsycqyz]

@XuChen-MSFT FYI

[wsycqyz]

@vkjammala-arista Do you need to backport to 202311 branch?

[wsycqyz]

LGTM

[StormLiangMS]

hi @XuChen-MSFT @developfast could you help to review this PR also?

[developfast]

changes lgtm - thanks for the fixture change to provide support on dualtor

[developfast]

@yxieca can you pls help merge?

[vkjammala-arista]

@vkjammala-arista Do you need to backport to 202311 branch?

Hi @wsycqyz, we need this fix in 202311 as well (as mentioned in description). Thanks!

[mssonicbld]

Cherry-pick PR to 202405: #13247

[mssonicbld]

@vkjammala-arista PR conflicts with 202305 branch

[mssonicbld]

Cherry-pick PR to 202311: #13260

[StormLiangMS]

hi @vkjammala-arista, could you file separate PR for 202305, it is a conflict.

[vkjammala-arista]

hi @vkjammala-arista, could you file separate PR for 202305, it is a conflict.

Hi @StormLiangMS, this change is NA for 202305 (test doesn't exist there). Thanks!