Skip to content

Commit

Permalink
[SAI submodule update] Enable support for SAI v1.10.2 (sonic-net#1034)
Browse files Browse the repository at this point in the history
* [SAI submodule update] Enable support for SAI header v1.10.2
  • Loading branch information
vmittal-msft authored Apr 20, 2022
1 parent c7cbfe8 commit 6baff35
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion SAI
Submodule SAI updated 62 files
+1 −1 debian/installerFiles/python-saithriftv2.install
+41 −0 doc/SAI-Proposal-ECMP-Member-Count.md
+213 −0 doc/SAI-Proposal-PFC_Deadlock_State.md
+61 −1 doc/SAI-Proposal-versioning.md
+40 −35 doc/UDF-based-ACL.md
+1 −0 inc/sai.h
+11 −1 inc/saiacl.h
+9 −0 inc/saicounter.h
+21 −0 inc/saimacsec.h
+16 −0 inc/saimirror.h
+51 −0 inc/sainat.h
+2 −0 inc/sainexthopgroup.h
+57 −0 inc/saiobject.h
+59 −0 inc/saiport.h
+64 −0 inc/saiqueue.h
+28 −0 inc/saiswitch.h
+31 −0 inc/saitypes.h
+14 −2 inc/saiversion.h
+12 −9 inc/saivlan.h
+1 −0 meta/ancestry.pl
+44 −4 meta/aspell.en.pws
+1 −4 meta/checkheaders.pl
+12 −1 meta/parse.pl
+5 −0 meta/saimetadatatypes.h
+2 −2 meta/saimetadatautils.c
+18 −3 meta/saisanitycheck.c
+5 −0 meta/serialize.pm
+54 −0 meta/style.pm
+17 −2 meta/utils.pm
+110 −0 ptf/lpm.py
+6,218 −0 ptf/saiacl.py
+431 −0 ptf/saibridgeport.py
+671 −0 ptf/saibuffer.py
+2,304 −0 ptf/saidebugcounters.py
+3,857 −0 ptf/saifdb.py
+3,244 −0 ptf/saihash.py
+2,928 −0 ptf/saihostif.py
+268 −0 ptf/saiisolationgroup.py
+1,357 −0 ptf/sailag.py
+2,719 −0 ptf/saimirror.py
+3,818 −0 ptf/saimpls.py
+1,515 −0 ptf/sainat.py
+215 −0 ptf/saineighbor.py
+866 −0 ptf/sainexthop.py
+3,733 −0 ptf/sainexthopgroup.py
+943 −0 ptf/saipolicer.py
+2,751 −0 ptf/saiport.py
+9,591 −0 ptf/saiqosmap.py
+921 −0 ptf/saiqueue.py
+7,960 −0 ptf/sairif.py
+1,113 −0 ptf/sairoute.py
+719 −0 ptf/saischeduler.py
+114 −0 ptf/saischedulergroup.py
+2,976 −0 ptf/saisrv6.py
+1,780 −0 ptf/saiswitch.py
+22,798 −0 ptf/saitunnel.py
+2,412 −0 ptf/saivlan.py
+2,677 −0 ptf/saivrf.py
+431 −0 ptf/saiwred.py
+1,146 −0 ptf/testplan.md
+103 −0 test/saithrift/README.md
+0 −88 test/saithrift/README.txt
4 changes: 4 additions & 0 deletions lib/sai_redis_nexthopgroup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

REDIS_BULK_CREATE(NEXT_HOP_GROUP_MEMBER,next_hop_group_members);
REDIS_BULK_REMOVE(NEXT_HOP_GROUP_MEMBER,next_hop_group_members);
REDIS_BULK_GET(NEXT_HOP_GROUP_MEMBER,next_hop_group_members);
REDIS_BULK_SET(NEXT_HOP_GROUP_MEMBER,next_hop_group_members);
REDIS_GENERIC_QUAD(NEXT_HOP_GROUP,next_hop_group);
REDIS_GENERIC_QUAD(NEXT_HOP_GROUP_MEMBER,next_hop_group_member);
REDIS_GENERIC_QUAD(NEXT_HOP_GROUP_MAP,next_hop_group_map);
Expand All @@ -14,4 +16,6 @@ const sai_next_hop_group_api_t redis_next_hop_group_api = {
redis_bulk_create_next_hop_group_members,
redis_bulk_remove_next_hop_group_members,
REDIS_GENERIC_QUAD_API(next_hop_group_map)
redis_bulk_get_next_hop_group_members,
redis_bulk_set_next_hop_group_members
};
2 changes: 2 additions & 0 deletions lib/sai_redis_port.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ REDIS_GENERIC_QUAD(PORT_SERDES,port_serdes);
REDIS_GENERIC_QUAD(PORT_CONNECTOR,port_connector);
REDIS_GENERIC_STATS(PORT,port);
REDIS_GENERIC_STATS(PORT_POOL,port_pool);
REDIS_BULK_QUAD(PORT, ports);

const sai_port_api_t redis_port_api = {

Expand All @@ -26,4 +27,5 @@ const sai_port_api_t redis_port_api = {
REDIS_GENERIC_STATS_API(port_pool)
REDIS_GENERIC_QUAD_API(port_connector)
REDIS_GENERIC_QUAD_API(port_serdes)
REDIS_BULK_QUAD_API(ports)
};
1 change: 1 addition & 0 deletions syncd/SwitchNotifications.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ namespace syncd
.on_bfd_session_state_change = &Slot<context>::onBfdSessionStateChange,
.on_fdb_event = &Slot<context>::onFdbEvent,
.on_ipsec_sa_status_change = nullptr,
.on_nat_event = nullptr,
.on_packet_event = nullptr,
.on_port_state_change = &Slot<context>::onPortStateChange,
.on_queue_pfc_deadlock = &Slot<context>::onQueuePfcDeadlock,
Expand Down
4 changes: 4 additions & 0 deletions vslib/sai_vs_nexthopgroup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

VS_BULK_CREATE(NEXT_HOP_GROUP_MEMBER,next_hop_group_members);
VS_BULK_REMOVE(NEXT_HOP_GROUP_MEMBER,next_hop_group_members);
VS_BULK_GET(NEXT_HOP_GROUP_MEMBER,next_hop_group_members);
VS_BULK_SET(NEXT_HOP_GROUP_MEMBER,next_hop_group_members);

VS_GENERIC_QUAD(NEXT_HOP_GROUP,next_hop_group);
VS_GENERIC_QUAD(NEXT_HOP_GROUP_MEMBER,next_hop_group_member);
Expand All @@ -15,4 +17,6 @@ const sai_next_hop_group_api_t vs_next_hop_group_api = {
vs_bulk_create_next_hop_group_members,
vs_bulk_remove_next_hop_group_members,
VS_GENERIC_QUAD_API(next_hop_group_map)
vs_bulk_get_next_hop_group_members,
vs_bulk_set_next_hop_group_members
};
2 changes: 2 additions & 0 deletions vslib/sai_vs_port.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ VS_GENERIC_QUAD(PORT_CONNECTOR,port_connector);
VS_GENERIC_QUAD(PORT_SERDES,port_serdes);
VS_GENERIC_STATS(PORT,port);
VS_GENERIC_STATS(PORT_POOL,port_pool);
VS_BULK_QUAD(PORT,ports);

const sai_port_api_t vs_port_api = {

Expand All @@ -28,4 +29,5 @@ const sai_port_api_t vs_port_api = {
VS_GENERIC_QUAD_API(port_connector)

VS_GENERIC_QUAD_API(port_serdes)
VS_BULK_QUAD_API(ports)
};

0 comments on commit 6baff35

Please sign in to comment.