From 6baff35880005aee2854fdcde105c4322c28d04f Mon Sep 17 00:00:00 2001
From: vmittal-msft <46945843+vmittal-msft@users.noreply.github.com>
Date: Tue, 19 Apr 2022 21:47:40 -0700
Subject: [PATCH] [SAI submodule update] Enable support for SAI v1.10.2 (#1034)

* [SAI submodule update] Enable support for SAI header v1.10.2
---
 SAI                            | 2 +-
 lib/sai_redis_nexthopgroup.cpp | 4 ++++
 lib/sai_redis_port.cpp         | 2 ++
 syncd/SwitchNotifications.h    | 1 +
 vslib/sai_vs_nexthopgroup.cpp  | 4 ++++
 vslib/sai_vs_port.cpp          | 2 ++
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/SAI b/SAI
index 942c28ca6c10..d721a65216cd 160000
--- a/SAI
+++ b/SAI
@@ -1 +1 @@
-Subproject commit 942c28ca6c107661308dc9c37341c900fd73d19f
+Subproject commit d721a65216cd5073637335b1ca0690f100c617e6
diff --git a/lib/sai_redis_nexthopgroup.cpp b/lib/sai_redis_nexthopgroup.cpp
index 21d05db659ed..f7c2dd8b6481 100644
--- a/lib/sai_redis_nexthopgroup.cpp
+++ b/lib/sai_redis_nexthopgroup.cpp
@@ -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);
@@ -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
 };
diff --git a/lib/sai_redis_port.cpp b/lib/sai_redis_port.cpp
index fa2501f5ce03..a4b220dff4e9 100644
--- a/lib/sai_redis_port.cpp
+++ b/lib/sai_redis_port.cpp
@@ -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 = {
 
@@ -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)
 };
diff --git a/syncd/SwitchNotifications.h b/syncd/SwitchNotifications.h
index ab38686c4ac5..798f7cb9fe46 100644
--- a/syncd/SwitchNotifications.h
+++ b/syncd/SwitchNotifications.h
@@ -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,
diff --git a/vslib/sai_vs_nexthopgroup.cpp b/vslib/sai_vs_nexthopgroup.cpp
index 2a6e84d9a444..7abeab0c50aa 100644
--- a/vslib/sai_vs_nexthopgroup.cpp
+++ b/vslib/sai_vs_nexthopgroup.cpp
@@ -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);
@@ -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
 };
diff --git a/vslib/sai_vs_port.cpp b/vslib/sai_vs_port.cpp
index 79bccf7771e1..b75e7e9853de 100644
--- a/vslib/sai_vs_port.cpp
+++ b/vslib/sai_vs_port.cpp
@@ -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 = {
 
@@ -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)
 };