Skip to content

[action] [PR:9625] [Mellanox][Dual-Tor][DSCP remapping]Fix a test issue for the dualtor tunnel monitor for Nvidia platforms #11299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 1 commit into from
Jan 22, 2024
Merged

[action] [PR:9625] [Mellanox][Dual-Tor][DSCP remapping]Fix a test issue for the dualtor tunnel monitor for Nvidia platforms #11299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions tests/common/devices/sonic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1718,6 +1718,9 @@ def get_asic_name(self):

return asic

def is_nvidia_platform(self):
return 'mellanox' == self.facts['asic_type']

def _get_platform_asic(self, platform):
platform_asic = os.path.join(
"/usr/share/sonic/device", platform, "platform_asic"
Expand Down
6 changes: 6 additions & 0 deletions tests/common/dualtor/tunnel_traffic_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,12 @@ def _disassemble_ip_tos(tos):
inner_dscp, _ = _disassemble_ip_tos(inner_tos)
logging.info("Outer packet DSCP: {0:06b}, inner packet DSCP: {1:06b}".format(outer_dscp, inner_dscp))
check_res = []
# For Nvidia platforms, queue check for outer/inner dscp 2/2 and 6/6 will fail due to the diversity
# in dscp remapping. Since we don't expect such packets in production, skip the queue check in this case.
if self.standby_tor.is_nvidia_platform():
logging.info("Skip the queue check for inner/outer dscp 2/2 and 6/6 on Nvidia platforms.")
if (inner_dscp, outer_dscp) in [(2, 2), (6, 6)]:
return " ,".join(check_res)
exp_queue = derive_queue_id_from_dscp(self.standby_tor, inner_dscp, True)
logging.info("Expect queue: %s", exp_queue)
if not wait_until(60, 5, 0, queue_stats_check, self.standby_tor, exp_queue, self.packet_count):
Expand Down