Skip to content

Make thermal related test work on both 201911 and master#2657

Merged
wangxin merged 5 commits intosonic-net:masterfrom
Junchao-Mellanox:make_thermal_tests_work_on_master_and_1911
Dec 21, 2020
Merged

Make thermal related test work on both 201911 and master#2657
wangxin merged 5 commits intosonic-net:masterfrom
Junchao-Mellanox:make_thermal_tests_work_on_master_and_1911

Conversation

@Junchao-Mellanox
Copy link
Contributor

@Junchao-Mellanox Junchao-Mellanox commented Dec 14, 2020

Description of PR

Summary:
Make thermal related test work on both 201911 and master

Type of change

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

Approach

What is the motivation for this PR?

Now thermalctld works different between 201911 and master. For example, show platform fan displays 6 columns on 201911 but 8 columns on master. This PR makes it work both on master and 201911.

How did you do it?

  1. Add a new property kernel version in SonicHost, for 201911, the version should be 4.9.0, for master, the version should be 4.19.0 or higher.
  2. Make some changes in test cases according to the kernel version

How did you verify/test it?

Run thermal related regression test cases

Any platform specific information?

N/A

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

Documentation

@Junchao-Mellanox Junchao-Mellanox marked this pull request as ready for review December 14, 2020 03:55
@Junchao-Mellanox Junchao-Mellanox mentioned this pull request Dec 14, 2020
Closed
3 tasks
@Junchao-Mellanox
Copy link
Contributor Author

Junchao-Mellanox commented Dec 14, 2020

@keboliu please help review, thanks!

wangxin
wangxin reviewed Dec 15, 2020
View reviewed changes
tests/common/devices.py Outdated
Gets the SONiC kernel version
:return:
"""
return self.setup()['ansible_facts']['ansible_kernel'].split('-')[0]
Copy link
Collaborator

@wangxin wangxin Dec 15, 2020

Choose a reason for hiding this comment

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

Can you consider using command like uname -r to get kernel version? The ansible setup command is a little bit too heavy.

tests/platform_tests/mellanox/mellanox_thermal_control_test_helper.py

# Speed tolerance
SPEED_TOLERANCE = 0.2
SPEED_TOLERANCE = 0.5
Copy link
Collaborator

@wangxin wangxin Dec 15, 2020

Choose a reason for hiding this comment

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

Why increase speed tolerance?

Copy link
Contributor Author

@Junchao-Mellanox Junchao-Mellanox Dec 16, 2020

Choose a reason for hiding this comment

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

The speed tolerance in production code is 50%, here is to align the test case with it.

@wangxin wangxin merged commit 3c513c0 into sonic-net:master Dec 21, 2020
@Junchao-Mellanox Junchao-Mellanox deleted the make_thermal_tests_work_on_master_and_1911 branch January 7, 2021 09:27
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@theasianpianist
[202012][swss]: Submodule update for SWSS (sonic-net#13722)
4e70a2b 
Include following commits:
- c98b9f09 [202012][orchagent]: Get bridge port ID from FDBOrch cache instead of SAI API sonic-net#2657 (sonic-net#2658)
- 59886b8f [MuxOrch] Enabling neighbor when adding in active state (sonic-net#2601)
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@yxieca
[202205][utilities][swss-common][sairedis][platform-common][swss] adv…
1f6456a 
…ance submodule head (sonic-net#14029)

utilities:
* a4f141f1 2023-01-10 | [sfputil] Firmware download/upgrade CLI support for QSFP-DD (sonic-net#1947) (sonic-net#2349) (HEAD -> 202205) [CliveNi]

swss-common:
* 41fcad8 2023-01-30 | Increase the netlink buffer size from 3MB to 16MB. (sonic-net#739) (HEAD -> 202205) [KISHORE KUNAL]

sairedis:
* 5ce9990 2023-02-27 | [Dual-ToR] update sai.profile with SAI_ADDITIONAL_MAC_ENABLED attribute if corresponding arg passed to syncd (sonic-net#1201) (HEAD -> 202205) [Andriy Yurkiv]
* 3c2e0c5 2023-02-23 | Use new value of STATE_DB FAST_REBOOT entry (sonic-net#1196) [Aryeh Feigin]
* fe7756f 2023-02-28 | [submodule][SAI]Advance SAI head (sonic-net#1210) (github/202205) [Richard.Yu]

platform-common:
* 321a8e7 2022-09-23 | Cdb fw upgrade (sonic-net#308) (HEAD -> 202205) [CliveNi]

swss:
* ceea558 2023-02-28 | [orchagent]: Get bridge port ID from orchagent cache instead of SAI API (sonic-net#2657) (HEAD -> 202205) [Lawrence Lee]
* bd04e24 2023-03-01 | [dualtor] Fix neighbor miss when mux is not ready (sonic-net#2676) (HEAD -> 202205) [Longxiang Lyu]
* 7d87a90 2023-02-28 | [ci] Fix pipeline error about team5 not found. (sonic-net#2684) [Liu Shilong]
* 93a924c 2023-02-27 | [aclorch] Fixed issue sonic-net#2204.Support IN_PORTS qualifer in MIRRORV6 table. (sonic-net#2668) [Rajkumar-Marvell]
* 9d87ec4 2023-02-23 | swss: Fix Invalid port oid messages generated because of voq counters. (sonic-net#2653) [Sambath Kumar Balasubramanian]

Signed-off-by: Ying Xie <[email protected]>
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
@StormLiangMS
[submodule advance] advance sonic-swss sonic-net#14116
b144564 
Why I did it
submodule advance

b085b5f - [ci] Fix pipeline error about team5 not found. (Core dump in orchagent when assigning router interface to a vlan with untagged mode  sonic-net#2684) (3 hours ago) [Liu Shilong]
4549b4c - Fix issue: there is no retry while creating a RIF which is in removing state ([201811 sub-module] advance sub-modules: utilities, swss, swss-common sonic-net#2679) (3 hours ago) [Junchao-Mellanox]
980a45b - [FDB]Fixing FDB consolidated flush for Remote MACs (pmon to stretch sonic-net#2673) (3 hours ago) [Sudharsan Dhamal Gopalarathnam]
c646607 - Do not allow to add port to .1Q bridge while router port deletion is not completed (Update SDK, FW and SAI sonic-net#2669) (3 hours ago) [Lior Avramov]
4a321f0 - [orchagent]: Get bridge port ID from orchagent cache instead of SAI API ([201811 sub module] advance sairedis sub module sonic-net#2657) (3 hours ago) [Lawrence Lee]
f4b88f3 - [Dual-ToR] handle 'mux_tunnel_egress_acl' attrib in order to change ACL configuration (drop on ingress/egress) on standby ToR (lm75 doesn't support written alarm to syslog. sonic-net#2646) (3 hours ago) [Andriy Yurkiv]
a4f29c1 - [Workaround] EvpnRemoteVnip2pOrch warmboot check failure ([teamd]: wait for swss db flush done before starting teamd container sonic-net#2626) (3 hours ago) [jcaiMR]
53ee0a8 - Support for tc-dot1p and tc-dscp qosmap ([201803] [router-advertiser] Add templated script to wait for pertinent interfaces to be ready before starting radvd sonic-net#2559) (3 hours ago) [Divya Mukundan]
b953866 - [dual-tor] add missing SAI attribte in order to create IPNIP tunnel (Config reload/load_minigraph not clearing State DB sonic-net#2503) (3 hours ago) [Andriy Yurkiv]
How I did it
How to verify it
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wangxin wangxin wangxin approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Junchao-Mellanox @wangxin