Skip to content

[code sync] Merge code from sonic-net/sonic-sairedis:202412 to 202503#59

Merged
mssonicbld merged 16 commits intoAzure:202503from
mssonicbld:sonicbld/202503-merge
Jul 7, 2025
Merged

[code sync] Merge code from sonic-net/sonic-sairedis:202412 to 202503#59
mssonicbld merged 16 commits intoAzure:202503from
mssonicbld:sonicbld/202503-merge

Conversation

@mssonicbld
Copy link
Collaborator

@mssonicbld mssonicbld commented May 29, 2025

* b36d5641 - (base/202412) [trim]: Add Packet Trimming Asym DSCP to VS lib (#68) (2025-07-04) [mssonicbld]
* 6e75cc6c - [TAM]: Add default SAI_TAM_ATTR_TELEMETRY_OBJECTS_LIST of TAM for saivs create operation (#1614) (#66) (2025-06-29) [Ze Gan]
* 0ae8494d - [unittest ]Conditionally enable TestServerSaiMockChannel (#67) (2025-06-30) [mssonicbld]
* 12b21f3b - [syncd] Check whether stat_st and tam_telemetry is defined (#1590) (#65) (2025-06-25) [Ze Gan]
* 701a114b - [TAM]: Fix TAM notification and vslib implementation (#1606) (#62) (2025-06-24) [Ze Gan]
* 6b97f74e - [SAI]: Update SAI to support QUERY_STATS_ST_CAPABILITY and TAM (#1573) (#63) (2025-06-24) [Ze Gan]
* f21e12ce - [trim]: Add Packet Trimming Port/Queue stats to VS lib (#60) (2025-06-11) [Nazarii Hnydyn]
*   9d396448 - Merge pull request #61 from mssonicbld/cherry/msft-202412/1548 (2025-06-08) [Ze Gan]
|\  
| * 613654bb - [syncd] Move log set function after api initialize (2025-06-08) [Sonic Build Admin]
|/  
* e18530c8 - Update SAI version to 1.16.1 (#54) (2025-05-12) [mramezani95]
* 3c33c26e - Update codeql runs-on ubuntu version to 22.04 (#56) (2025-05-10) [mssonicbld]
* 87d6f464 - [trim]: Add Packet Trimming to VS lib (#55) (2025-05-09) [mssonicbld]
* 80c43090 - Support auto negotiation on the VS platform to avoid error messages. (#52) (2025-05-01) [mssonicbld]
* 0209ab89 - [FlexCounter] add support for SRv6 MySID counters (#50) (2025-04-28) [mssonicbld]
* aceb9ed1 - Move time stamp to time stamp table in counter database to avoid frequently update the counter table (#51) (2025-04-28) [mssonicbld]<br>```

mssonicbld and others added 6 commits April 28, 2025 13:01
…uently update the counter table (Azure#51)

Move the timestamp out of the COUNTER table to avoid updating the table too frequently and overwhelming the telemetry system.
Fixes sonic-net/sonic-buildimage#22201
* Add support for a new SRv6 MySID counter
* Extended flex counter test
…zure#52)

Support auto negotiation on the VS platform to avoid error messages.
Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>

**HLD:** sonic-net/SONiC#1898

Requires SAI API v1.15.7

#### A picture of a cute animal (not mandatory but encouraged)
```
 .---. .-----------
 / \ __ / ------
 / / \( )/ -----
 ////// ' \/ ` ---
 //// / // : : ---
 // / / /` '--
// //..\\
 ====UU====UU====
 '//||\\`
 ''``
```
Update the CodeQL runner Ubuntu version. This is to address the following:
```
This is a scheduled Ubuntu 20.04 retirement. Ubuntu 20.04 LTS runner will be removed on 2025-04-15. For more details, see actions/runner-images#11101
```
* Updated SAI version to 1.16.1.

Signed-off-by: Mahdi Ramezani <mramezani@microsoft.com>

* [trim]: Add Packet Trimming to VS lib (Azure#55)

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>

**HLD:** sonic-net/SONiC#1898

Requires SAI API v1.15.7

#### A picture of a cute animal (not mandatory but encouraged)
```
 .---. .-----------
 / \ __ / ------
 / / \( )/ -----
 ////// ' \/ ` ---
 //// / // : : ---
 // / / /` '--
// //..\\
 ====UU====UU====
 '//||\\`
 ''``
```

* Update codeql runs-on ubuntu version to 22.04 (Azure#56)

Update the CodeQL runner Ubuntu version. This is to address the following:
```
This is a scheduled Ubuntu 20.04 retirement. Ubuntu 20.04 LTS runner will be removed on 2025-04-15. For more details, see actions/runner-images#11101
```

* Updated SAI version to 1.16.1.

Signed-off-by: Mahdi Ramezani <mramezani@microsoft.com>

---------

Signed-off-by: Mahdi Ramezani <mramezani@microsoft.com>
Co-authored-by: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
@mssonicbld mssonicbld force-pushed the sonicbld/202503-merge branch 7 times, most recently from 6a94732 to 2c9e13a Compare June 5, 2025 03:03
@mssonicbld mssonicbld force-pushed the sonicbld/202503-merge branch 3 times, most recently from cc16221 to 0329d7d Compare June 8, 2025 03:06
mssonicbld and others added 2 commits June 8, 2025 10:29
It may happen that in case of virtual switch, logset will be called before api initialize, which will log error messages, since VS was not initialized yet, and logSet in VS requires api to be initialized before call
[action] [PR:1548] [syncd] Move log set function after api initialize
@mssonicbld mssonicbld force-pushed the sonicbld/202503-merge branch 3 times, most recently from 2337c78 to 4499e2f Compare June 11, 2025 03:23
Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
@mssonicbld mssonicbld force-pushed the sonicbld/202503-merge branch from 4499e2f to 1880dc3 Compare June 12, 2025 03:04
sai_status_t SwitchStateBase::queryStatsCapability(
_In_ sai_object_id_t switchId,
_In_ sai_object_type_t objectType,
sai_status_t SwitchStateBase::queryPortStatsCapability(

Check warning

Code scanning / CodeQL

Poorly documented large function Warning

Poorly documented function: fewer than 2% comments for a function of 118 lines.
@mssonicbld mssonicbld force-pushed the sonicbld/202503-merge branch 5 times, most recently from 5f78130 to 39f5b6d Compare June 17, 2025 03:02
@mssonicbld mssonicbld force-pushed the sonicbld/202503-merge branch 7 times, most recently from 25a30c0 to 55b8ae7 Compare June 24, 2025 03:02
Azure#63)

* [SAI]: Update SAI to support QUERY_STATS_ST_CAPABILITY and TAM (#1573)

[SAI]: Update SAI to support QUERY_STATS_ST_CAPABILITY and TAM

---------

Signed-off-by: Ze Gan <ganze718@gmail.com>

* Fix conflict

Signed-off-by: Ze Gan <ganze718@gmail.com>

---------

Signed-off-by: Ze Gan <ganze718@gmail.com>
Fix TAM notification issue that uses the wrong RID instead of VID
Add default attributes for TAM objects

Signed-off-by: Ze Gan <ganze718@gmail.com>
@mssonicbld mssonicbld force-pushed the sonicbld/202503-merge branch from 55b8ae7 to f395f71 Compare June 25, 2025 03:03
…zure#65)

Check if sai_query_stats_st_capability sai_tam_telemetry_get_data is defined whilie configure to make sure if vendor is not implementing those new APIs then it will still link syncd for VendorSai.cpp

Signed-off-by: Ze Gan <ganze718@gmail.com>
Co-authored-by: Kamil Cudnik <kcudnik@gmail.com>
@mssonicbld mssonicbld force-pushed the sonicbld/202503-merge branch 5 times, most recently from f510696 to 7ee0c47 Compare June 30, 2025 03:03
mssonicbld and others added 2 commits June 30, 2025 13:12
Use `#ifdef MOCK_METHOD` to conditionally enable TestServerSaiMockChannel. This macro is introduced in gmock 1.10, however slave buster has older version of gmock 1.8, within which compiling `unittest/lib/TestServerSai.cpp` fails.
@mssonicbld mssonicbld force-pushed the sonicbld/202503-merge branch 3 times, most recently from 18b3c80 to d5484fb Compare July 3, 2025 03:02
Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>

**DEPENDS:**
1. sonic-net/sonic-swss#3712

**HLD:** sonic-net/SONiC#1988

Requires SAI API v1.16.1

#### A picture of a cute animal (not mandatory but encouraged)
```
 .---. .-----------
 / \ __ / ------
 / / \( )/ -----
 ////// ' \/ ` ---
 //// / // : : ---
 // / / /` '--
// //..\\
 ====UU====UU====
 '//||\\`
 ''``
```
@mssonicbld mssonicbld force-pushed the sonicbld/202503-merge branch 3 times, most recently from da23ec5 to ad5a529 Compare July 6, 2025 03:03
@mssonicbld mssonicbld force-pushed the sonicbld/202503-merge branch from ad5a529 to 8f50be7 Compare July 7, 2025 03:02
@mssonicbld mssonicbld merged commit c4d152d into Azure:202503 Jul 7, 2025
3 checks passed
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.

4 participants