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 #1506

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

Conversation

abdosi
Copy link
Contributor

@abdosi abdosi commented Jan 23, 2025

What I did:

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)

Signed-off-by: Abhishek Dosi <[email protected]>
@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@abdosi abdosi requested review from kcudnik and rlhui January 23, 2025 18:47
@abdosi
Copy link
Contributor Author

abdosi commented Jan 23, 2025

@dgsudharsan for viz. @BYGX-wcr for viz.

kcudnik
kcudnik previously approved these changes Jan 23, 2025
BYGX-wcr
BYGX-wcr previously approved these changes Jan 23, 2025
Copy link

@BYGX-wcr BYGX-wcr left a comment

Choose a reason for hiding this comment

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

Needed for srv6 support

@abdosi
Copy link
Contributor Author

abdosi commented Jan 25, 2025

/azp run Azure.sonic-sairedis

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).

@abdosi
Copy link
Contributor Author

abdosi commented Jan 28, 2025

/azp run Azure.sonic-sairedis

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).

@kcudnik
Copy link
Collaborator

kcudnik commented Feb 2, 2025

please resolve conflicts

@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@abdosi abdosi changed the title [sonic-sairedis] Moved SAI submodule to v1.15.4 [sonic-sairedis] Moved SAI submodule to SAI master Feb 10, 2025
Signed-off-by: Abhishek Dosi <[email protected]>
@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@abdosi
Copy link
Contributor Author

abdosi commented Feb 10, 2025

@kcudnik : can you please help check this build error ?

@kcudnik
Copy link
Collaborator

kcudnik commented Feb 11, 2025

libtool: compile:  g++ -DHAVE_CONFIG_H -I. -I.. -DNDEBUG -Wdate-time -D_FORTIFY_SOURCE=2 -g -I../SAI/inc -I../SAI/experimental -I../SAI/meta -I../lib -ansi -fPIC -pipe -std=c++14 -Wall -Wcast-align -Wcast-qual -Wconversion -Wdisabled-optimization -Werror -Wextra -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wimport -Winit-self -Wno-inline -Winvalid-pch -Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wno-aggregate-return -Wno-padded -Wno-switch-enum -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wshadow -Wstack-protector -Wstrict-aliasing=3 -Wswitch -Wswitch-default -Wunreachable-code -Wunused -Wvariadic-macros -Wwrite-strings -Wno-switch-default -Wconversion -Wno-psabi -Wcast-align=strict -O0 -g -fprofile-arcs -ftest-coverage -g -O2 -ffile-prefix-map=/__w/1/s=. -fstack-protector-strong -Wformat -Werror=format-security -c SelectableChannel.cpp  -fPIC -DPIC -o .libs/libsaimeta_la-SelectableChannel.o
SaiSerialize.cpp: In function 'std::string sai_serialize_port_oper_status_ntf(uint32_t, const sai_port_oper_status_notification_t*)':
SaiSerialize.cpp:2458:89: error: 'const sai_port_oper_status_notification_t' {aka 'const struct _sai_port_oper_status_notification_t'} has no member named 'port_error_status'
 2458 |         item["port_error_status"] = sai_serialize_port_error_status(port_oper_status[i].port_error_status);
      |                                                                                         ^~~~~~~~~~~~~~~~~
SaiSerialize.cpp: In function 'void sai_deserialize_port_oper_status_ntf(const std::string&, uint32_t&, sai_port_oper_status_notification_t**)':
SaiSerialize.cpp:5202:78: error: 'struct _sai_port_oper_status_notification_t' has no member named 'port_error_status'
 5202 |         sai_deserialize_port_error_status(j[i]["port_error_status"], data[i].port_error_status);
      |                                                                              ^~~~~~~~~~~~~~~~~
/bin/bash ../libtool  --tag=CXX   --mode=compile g++ -DHAVE_CONFIG_H -I. -I..  -DNDEBUG -Wdate-time -D_FORTIFY_SOURCE=2 -g -I../SAI/inc -I../SAI/experimental -I../SAI/meta -I../lib -ansi -fPIC -pipe -std=c++14 -Wall -Wcast-align -Wcast-qual -Wconversion -Wdisabled-optimization -Werror -Wextra -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wimport -Winit-self -Wno-inline -Winvalid-pch -Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wno-aggregate-return -Wno-padded -Wno-switch-enum -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wshadow -Wstack-protector -Wstrict-aliasing=3 -Wswitch -Wswitch-default -Wunreachable-code -Wunused -Wvariadic-macros -Wwrite-strings -Wno-switch-default -Wconversion -Wno-psabi -Wcast-align=strict -O0 -g -fprofile-arcs -ftest-coverage -g -O2 -ffile-prefix-map=/__w/1/s=. -fstack-protector-strong -Wformat -Werror=format-security -c -o libsaimeta_la-DummySaiInterface.lo `test -f 'DummySaiInterface.cpp' || echo './'`DummySaiInterface.cpp
make[4]: *** [Makefile:911: libsaimeta_la-SaiSerialize.lo] Error 1
make[4]: *** Waiting for unfinished jobs....
libtool: compile:  g++ -DHAVE_CONFIG_H -I. -I.. -DNDEBUG -Wdate-time -D_FORTIFY_SOURCE=2 -g -I../SAI/inc 

code needs to be updated since you are moving SAI headers forward, which this change is not backward compatible, and there is no port_error_status in port_notifiation any more

you need to remove that code, as well you can remove workaround on that notification in syncd

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.

5 participants