Skip to content
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.

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

[sonic-sairedis] Moved SAI submodule to SAI master with compatibility-oriented code changes #1530

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

BYGX-wcr
Copy link

@BYGX-wcr BYGX-wcr commented Feb 11, 2025

Moved SAI submodule to it's latest master in sonic-sairedis. Following SAI commits:

ff3424512031258ed2431b06b64beea5bc36712 [SRv6] Extend validonly list for SAI_MY_SID_ENTRY_ATTR_TUNNEL_ID in _sai_my_sid_entry_attr_t (#2130)
dc64a515bce7622e52da548c1c8ddc9c423956f0 Add packet trimming API (#2077)
b2be07629cdbf6073ad77f7ac984cfb07bc12231 [meta] Allow validonly attr to be conditioned on other validonly (#2131)
1443ba88cd8db92aa978780163b7cb2650dc0770 Add HA session attribute Bounceback IP (#2091)
b4358c73b419346b1563bb58451851a5890191db [meta] Update check attr condition/validonly (#2126)
61a1a298fcd847c4957ae793746e6c958358e1b8 SAI release notes for 1.15.1 version (#2123)
0aba2360f0dbb7b869628fd9aca6c4ffd1d401a8 EVPN Multi Home Support (#2084)
775254cddc34b12393d3e197bfcc35b3dd2a4cf4 add SRv6 uSID behaviors to the validonly lists (#2120)
d24cbb24767878c4242aa9cf47154b2697e6f8dc Unify SAI_HOSTIF_USER_DEFINED_TRAP_TYPE_CUSTOM_RANGE_BASE (#2114)
2602b2aab37a045e46b0888a72855ae6bc68743e SAI Proposal TAM stream telemetry (#2089)
ab4743033be50a5d453a5f9987c0e17f53ea301a Adding additional Ether pkts stats ranges for Cisco Platforms (#1997)
ad20062eb1f2a24aa79983422e83b921b49c011f Introduce new extended port oper status notification (#2087)
97c8ed22ee4cb8ac4aef87190fcee2611d0bd2b0 [meta] Check global functions return type (#2115)
91ef792ea552d69d884b82227bb7df2cf688e7de [meta] Update history files (#2113)
5f75d99d91289152c45888631421f942aa75a256 Add custom range base enums for api and object_type (#2112)
48205828be521f775107185f8cfc7cbe62062530 [meta] Make sai switch pointers attr list stable (#2111)
13e195325122370050c3d4263e5143dff66714fc [dash] Change the type of action parameter in DASH Flow API (#2101)

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@BYGX-wcr BYGX-wcr requested a review from kcudnik February 11, 2025 18:46
@@ -1,69 +0,0 @@
#include <cstdint>
Copy link
Contributor

Choose a reason for hiding this comment

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

is this deleted by accident?

Copy link
Collaborator

Choose a reason for hiding this comment

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

bring this file back

@@ -17,7 +17,6 @@ tests_SOURCES = main.cpp \
TestNotificationHandler.cpp \
TestMdioIpcServer.cpp \
TestPortStateChangeHandler.cpp \
TestWorkaround.cpp \
Copy link
Collaborator

Choose a reason for hiding this comment

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

bring this back! as it tests other importnat thinkgs !

@@ -1,69 +0,0 @@
#include <cstdint>
Copy link
Collaborator

Choose a reason for hiding this comment

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

bring this file back

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@kcudnik
Copy link
Collaborator

kcudnik commented Feb 12, 2025

this PR is in conflict with #1531 why both PRs are moving SAI pointer to different location, what's the reason here ?

@BYGX-wcr
Copy link
Author

this PR is in conflict with #1531 why both PRs are moving SAI pointer to different location, what's the reason here ?

Initially, we wanted to move the SAI pointer to the latest master of SAI. Yet, as you can see, the build failed even after I added the changes to delete incompatible code.

@BYGX-wcr
Copy link
Author

Basically, the plan is to take #1531 first. This PR will be taken only if it can pass the build and we can make sure it won't break broadcom's SDK.

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

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.

6 participants