Skip to content

[action] [PR:10430] [Nvidia] Fix dscp remapping cases#11493

Merged
mssonicbld merged 1 commit intosonic-net:202205from
mssonicbld:cherry/202205/10430
Feb 1, 2024
Merged

[action] [PR:10430] [Nvidia] Fix dscp remapping cases#11493
mssonicbld merged 1 commit intosonic-net:202205from
mssonicbld:cherry/202205/10430

Conversation

@mssonicbld
Copy link
Collaborator

Description of PR

Summary:
Fix 2 issues of the dscp remapping test:

  1. The fix for the QoS SAI test lag support on Mellanox devices(PR [Nvidia] Fix qos sai test for supporting LAG port  #9587) is not working with the dscp remapping test.
    This affects the test case test_xoff_for_pcbb and test_tunnel_decap_dscp_to_pg_mapping
  2. Restore a logic which was accidently chnaged by PR Enhance qos tests to support single-asic, multi-asic, and multi-dut testing #8149:
    https://github.com/sonic-net/sonic-mgmt/pull/8149/files#diff-c1dbec061026de1f0fe921b088b2596a0a2b31ce337f567d3aadda76521254b0L835-R845
    Without the correct values for inner and outer dscp, the test will fail on Nvidia platforms.

Type of change

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

Back port request

  • 201911
  • 202012
  • 202205
  • 202305

Approach

What is the motivation for this PR?

Fix 2 issues of the dscp remapping test

How did you do it?

  1. For the first issue, when getting the dut port, if there is no key "dst" in interface_to_front_mapping, try to get the port by key "src". Currently the logic is if we use "port_map_file_ini" in the ptf test(which is used by the remapping test), there will be no key "dst" in interface_to_front_mapping.

  2. For the second issue, revert the wrong change.

How did you verify/test it?

Run all cases in test_tunnel_qos_remap.py on 4600c dualtor testbed, all passed.

Any platform specific information?

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

Documentation

* Fix dscp remapping cases

1. fix the lag support logic for dscp remapping test
2. fix a bug introduced by community PR sonic-net#8149
@mssonicbld
Copy link
Collaborator Author

Original PR: #10430

@mssonicbld mssonicbld merged commit eafd981 into sonic-net:202205 Feb 1, 2024
@mssonicbld mssonicbld deleted the cherry/202205/10430 branch February 4, 2024 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants