Skip to content

[202411] Fix vlan vs router mac issue with test_qos_dscp_mapping.py#18003

Merged
StormLiangMS merged 1 commit intosonic-net:202411from
rbpittman:qos_dscp_mapping_dualtor_double_202411
Apr 21, 2025
Merged

[202411] Fix vlan vs router mac issue with test_qos_dscp_mapping.py#18003
StormLiangMS merged 1 commit intosonic-net:202411from
rbpittman:qos_dscp_mapping_dualtor_double_202411

Conversation

@rbpittman
Copy link
Contributor

@rbpittman rbpittman commented Apr 16, 2025

Description of PR

Summary:
Double commit #17846

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405
  • 202411

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

  • Validate merge-conflict resolution on dualtor-aa

Any platform specific information?

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

Documentation

…#17846)

* Enable test_qos_dscp_mapping.py to check for VLAN macs, especially re dualtor topos that use an explicit VLAN mac.

* Rewrite utility to be more generic.

* Fix loopback search to do a double-break.

* Add logging details and comments.
@mssonicbld
Copy link
Collaborator

/azp run

@rbpittman rbpittman changed the title Fix vlan vs router mac issue with test_qos_dscp_mapping.py [202411] Fix vlan vs router mac issue with test_qos_dscp_mapping.py Apr 16, 2025
@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@wsycqyz wsycqyz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lğtm

@StormLiangMS StormLiangMS merged commit a7f50c6 into sonic-net:202411 Apr 21, 2025
14 checks passed
@rbpittman rbpittman deleted the qos_dscp_mapping_dualtor_double_202411 branch April 28, 2025 14:38
auspham pushed a commit to auspham/sonic-mgmt that referenced this pull request May 30, 2025
Code sync sonic-net/sonic-mgmt:202411 => 202503
```
*   6b59eaa (HEAD -> sync/202503, origin/sync/202503) Merge remote-tracking branch 'pub_upstream/202411' into sync/202503
|\
| * c6a94a0 (pub_upstream/202411) Revert "[dualtor_io] Allow duplications for link down downstream I/O (sonic-net#17909)" (sonic-net#18192)
| * de454d5 [testARPCompleted] Cleanup ptf ip after test failure (sonic-net#18170)
| * 4a3d1d9 [dualtor] Refine `fdb_mac_learning_test.py` (sonic-net#18092)
| * 5964a78 [dualtor_io] Fix the start marker not found issue (sonic-net#18096)
| * ce40816 Extend LACP time multiplier for advanced-reboot tests with cEOS peers (sonic-net#17964)
| * 0e70ba3 adjust port selection in case testQosSaiXonHysteresis for Cisco-8101 (sonic-net#18130)
| * 8bb7203 [202411] Restore disable packet aging fixture 202411 (sonic-net#18103)
| * 8f6d1a3 Filter out Not Applicable values in command line (sonic-net#18006)
| * 9d5de5c Backport t0-118 test configs to 202411 (sonic-net#17983)
| * e758401 mark xfail on generic hash test for isolated topo (sonic-net#18071)
| * c65ceab [202411][dualtor] Skip pfcwd warm reboot on dualtor (sonic-net#18072)
| * c509006 Improve disabling packet aging to support swap_syncd (sonic-net#17728) (sonic-net#17739)
| * 9dc2244 [202411][dualtor-aa] Fix test_arp_dualtor on active-active dualtor (sonic-net#18073)
| * cf12a33 fixed tacacs duplicate user issue (sonic-net#18068)
| * 330a893 Fix telemetry/test_events.py for dualtor (sonic-net#18025)
| * dc6fee8 Remove admin down ports in BUFFER PG check logic (sonic-net#17505)
| * 805d538 Update generic hash test to support dualtor active active topology (sonic-net#16217)
| * 7c31e46 [dualtor_io] Allow duplications for link down downstream I/O (sonic-net#17909)
| * a7f50c6 Fix vlan vs router mac issue with test_qos_dscp_mapping.py (sonic-net#17846) (sonic-net#18003)
| * 9ab1e7a Skip test_incremental_qos on Mellanox dualtor (sonic-net#17406) (sonic-net#18048)
| * f42afd0 Force eos default creds to be string (sonic-net#18026)
| * be542b0 Restore config after vxlan_crm from vxlan_ecmp. (sonic-net#17767)
| * f0718b9 [Fix for Issue sonic-net#17413] Modified the Tx Rx port id list selection for all to all scenario (sonic-net#17919)
| * 3eb4ed4 [dualtor_io] Collect syslog to debug (sonic-net#17722)
| * d5bd995 Disable PFC-WD during PCBB and some wmk test improvements (sonic-net#17889)
| * 2f512aa Update outer UDP sport range to exclude port 53 (sonic-net#17570) (sonic-net#17798)
| * 980b373 skip test_bgp_slb advanced reboot for isolated topo (sonic-net#17470)
| * 408bf9e Default the inner dscp to outer dscp map to be 1-1. (sonic-net#17860)
| * 37495a1 Add dualtor fixtures to no_traffic test. (sonic-net#17916)
| * a13b599 Only print the matched syslog in loganalzyer teardown check, no traceback info printed (sonic-net#17926)
| * 6127f29 Revert "Skip test_vnet_decap on Cisco-8000 with 202411 (sonic-net#17776)" (sonic-net#17941) (sonic-net#17942)
| * 60274db Increase timeout to 5 in verify_packet_any_port for background traffic (sonic-net#17904)
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants