[SAI submodule update] Enable support for SAI v1.11.0 (#1140)

* [SAI submodule update] Enable support for SAI v1.11.0 Signed-off-by: richardyu-ms <richard.yu@microsoft.com> * update SAI for saithift fix * upgrade to latest sai 1.11 add cases fix a code issue Signed-off-by: richardyu-ms <richard.yu@microsoft.com> * refactor code Signed-off-by: richardyu-ms <richard.yu@microsoft.com> Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
sonic-net · Nov 30, 2022 · 95891d7 · 95891d7
1 parent 3bb40a9
commit 95891d7
Show file tree

Hide file tree

Showing 29 changed files with 1,187 additions and 107 deletions.
diff --git a/SAI b/SAI
diff --git a/lib/ClientSai.cpp b/lib/ClientSai.cpp
@@ -1260,6 +1260,23 @@ sai_status_t ClientSai::bulkCreate(
             object_statuses);
 }
 
+sai_status_t ClientSai::bulkCreate(
+        _In_ uint32_t object_count,
+        _In_ const sai_neighbor_entry_t* neighbor_entry,
+        _In_ const uint32_t *attr_count,
+        _In_ const sai_attribute_t **attr_list,
+        _In_ sai_bulk_op_error_mode_t mode,
+        _Out_ sai_status_t *object_statuses)
+{
+    MUTEX();
+    SWSS_LOG_ENTER();
+    REDIS_CHECK_API_INITIALIZED();
+
+    // TODO support mode
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 // BULK CREATE HELPERS
 
 sai_status_t ClientSai::bulkCreate(
@@ -1436,6 +1453,19 @@ sai_status_t ClientSai::bulkRemove(
     return bulkRemove(SAI_OBJECT_TYPE_MY_SID_ENTRY, serializedObjectIds, mode, object_statuses);
 }
 
+sai_status_t ClientSai::bulkRemove(
+        _In_ uint32_t object_count,
+        _In_ const _sai_neighbor_entry_t *neighbor_entry,
+        _In_ sai_bulk_op_error_mode_t mode,
+        _Out_ sai_status_t *object_statuses)
+{
+    MUTEX();
+    SWSS_LOG_ENTER();
+    REDIS_CHECK_API_INITIALIZED();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 // BULK REMOVE HELPERS
 
 sai_status_t ClientSai::bulkRemove(
@@ -1607,6 +1637,20 @@ sai_status_t ClientSai::bulkSet(
     return bulkSet(SAI_OBJECT_TYPE_MY_SID_ENTRY, serializedObjectIds, attr_list, mode, object_statuses);
 }
 
+sai_status_t ClientSai::bulkSet(
+        _In_ uint32_t object_count,
+        _In_ const sai_neighbor_entry_t *neighbor_entry,
+        _In_ const sai_attribute_t *attr_list,
+        _In_ sai_bulk_op_error_mode_t mode,
+        _Out_ sai_status_t *object_statuses)
+{
+    MUTEX();
+    SWSS_LOG_ENTER();
+    REDIS_CHECK_API_INITIALIZED();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 // BULK SET HELPERS
 
 sai_status_t ClientSai::bulkSet(

diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -38,6 +38,7 @@ libsairedis_la_SOURCES = \
 						 sai_redis_debug_counter.cpp \
 						 sai_redis_dtel.cpp \
 						 sai_redis_fdb.cpp \
+						 sai_redis_genericprogrammable.cpp \
 						 sai_redis_hash.cpp \
 						 sai_redis_hostif.cpp \
 						 sai_redis_interfacequery.cpp \

diff --git a/lib/RedisRemoteSaiInterface.cpp b/lib/RedisRemoteSaiInterface.cpp
@@ -1453,6 +1453,24 @@ sai_status_t RedisRemoteSaiInterface::bulkRemove(
     return bulkRemove(SAI_OBJECT_TYPE_MY_SID_ENTRY, serializedObjectIds, mode, object_statuses);
 }
 
+sai_status_t RedisRemoteSaiInterface::bulkRemove(
+        _In_ uint32_t object_count,
+        _In_ const sai_neighbor_entry_t *neighbor_entry,
+        _In_ sai_bulk_op_error_mode_t mode,
+        _Out_ sai_status_t *object_statuses)
+{
+    SWSS_LOG_ENTER();
+
+    std::vector<std::string> serializedObjectIds;
+
+    for (uint32_t idx = 0; idx < object_count; idx++)
+    {
+        serializedObjectIds.emplace_back(sai_serialize_neighbor_entry(neighbor_entry[idx]));
+    }
+
+    return bulkRemove(SAI_OBJECT_TYPE_NEIGHBOR_ENTRY, serializedObjectIds, mode, object_statuses);
+}
+
 sai_status_t RedisRemoteSaiInterface::bulkSet(
         _In_ sai_object_type_t object_type,
         _In_ uint32_t object_count,
@@ -1568,6 +1586,25 @@ sai_status_t RedisRemoteSaiInterface::bulkSet(
     return bulkSet(SAI_OBJECT_TYPE_MY_SID_ENTRY, serializedObjectIds, attr_list, mode, object_statuses);
 }
 
+sai_status_t RedisRemoteSaiInterface::bulkSet(
+        _In_ uint32_t object_count,
+        _In_ const sai_neighbor_entry_t *neighbor_entry,
+        _In_ const sai_attribute_t *attr_list,
+        _In_ sai_bulk_op_error_mode_t mode,
+        _Out_ sai_status_t *object_statuses)
+{
+    SWSS_LOG_ENTER();
+
+    std::vector<std::string> serializedObjectIds;
+
+    for (uint32_t idx = 0; idx < object_count; idx++)
+    {
+        serializedObjectIds.emplace_back(sai_serialize_neighbor_entry(neighbor_entry[idx]));
+    }
+
+    return bulkSet(SAI_OBJECT_TYPE_NEIGHBOR_ENTRY, serializedObjectIds, attr_list, mode, object_statuses);
+}
+
 sai_status_t RedisRemoteSaiInterface::bulkSet(
         _In_ sai_object_type_t object_type,
         _In_ const std::vector<std::string> &serialized_object_ids,
@@ -1877,6 +1914,36 @@ sai_status_t RedisRemoteSaiInterface::bulkCreate(
             object_statuses);
 }
 
+sai_status_t RedisRemoteSaiInterface::bulkCreate(
+        _In_ uint32_t object_count,
+        _In_ const sai_neighbor_entry_t* neighbor_entry,
+        _In_ const uint32_t *attr_count,
+        _In_ const sai_attribute_t **attr_list,
+        _In_ sai_bulk_op_error_mode_t mode,
+        _Out_ sai_status_t *object_statuses)
+{
+    SWSS_LOG_ENTER();
+
+    // TODO support mode
+
+    std::vector<std::string> serialized_object_ids;
+
+    // on create vid is put in db by syncd
+    for (uint32_t idx = 0; idx < object_count; idx++)
+    {
+        std::string str_object_id = sai_serialize_neighbor_entry(neighbor_entry[idx]);
+        serialized_object_ids.push_back(str_object_id);
+    }
+
+    return bulkCreate(
+            SAI_OBJECT_TYPE_NEIGHBOR_ENTRY,
+            serialized_object_ids,
+            attr_count,
+            attr_list,
+            mode,
+            object_statuses);
+}
+
 sai_status_t RedisRemoteSaiInterface::notifySyncd(
         _In_ sai_object_id_t switchId,
         _In_ sai_redis_notify_syncd_t redisNotifySyncd)

diff --git a/lib/sai_redis.h b/lib/sai_redis.h
@@ -13,53 +13,54 @@ extern "C" {
 
 #define PRIVATE __attribute__((visibility("hidden")))
 
-PRIVATE extern const sai_acl_api_t              redis_acl_api;
-PRIVATE extern const sai_bfd_api_t              redis_bfd_api;
-PRIVATE extern const sai_bmtor_api_t            redis_bmtor_api;
-PRIVATE extern const sai_bridge_api_t           redis_bridge_api;
-PRIVATE extern const sai_buffer_api_t           redis_buffer_api;
-PRIVATE extern const sai_counter_api_t          redis_counter_api;
-PRIVATE extern const sai_debug_counter_api_t    redis_debug_counter_api;
-PRIVATE extern const sai_dtel_api_t             redis_dtel_api;
-PRIVATE extern const sai_fdb_api_t              redis_fdb_api;
-PRIVATE extern const sai_hash_api_t             redis_hash_api;
-PRIVATE extern const sai_hostif_api_t           redis_hostif_api;
-PRIVATE extern const sai_ipmc_api_t             redis_ipmc_api;
-PRIVATE extern const sai_ipmc_group_api_t       redis_ipmc_group_api;
-PRIVATE extern const sai_isolation_group_api_t  redis_isolation_group_api;
-PRIVATE extern const sai_l2mc_api_t             redis_l2mc_api;
-PRIVATE extern const sai_l2mc_group_api_t       redis_l2mc_group_api;
-PRIVATE extern const sai_lag_api_t              redis_lag_api;
-PRIVATE extern const sai_macsec_api_t           redis_macsec_api;
-PRIVATE extern const sai_mcast_fdb_api_t        redis_mcast_fdb_api;
-PRIVATE extern const sai_mirror_api_t           redis_mirror_api;
-PRIVATE extern const sai_mpls_api_t             redis_mpls_api;
-PRIVATE extern const sai_nat_api_t              redis_nat_api;
-PRIVATE extern const sai_neighbor_api_t         redis_neighbor_api;
-PRIVATE extern const sai_next_hop_api_t         redis_next_hop_api;
-PRIVATE extern const sai_next_hop_group_api_t   redis_next_hop_group_api;
-PRIVATE extern const sai_policer_api_t          redis_policer_api;
-PRIVATE extern const sai_port_api_t             redis_port_api;
-PRIVATE extern const sai_qos_map_api_t          redis_qos_map_api;
-PRIVATE extern const sai_queue_api_t            redis_queue_api;
-PRIVATE extern const sai_route_api_t            redis_route_api;
-PRIVATE extern const sai_router_interface_api_t redis_router_interface_api;
-PRIVATE extern const sai_rpf_group_api_t        redis_rpf_group_api;
-PRIVATE extern const sai_samplepacket_api_t     redis_samplepacket_api;
-PRIVATE extern const sai_scheduler_api_t        redis_scheduler_api;
-PRIVATE extern const sai_scheduler_group_api_t  redis_scheduler_group_api;
-PRIVATE extern const sai_srv6_api_t             redis_srv6_api;
-PRIVATE extern const sai_stp_api_t              redis_stp_api;
-PRIVATE extern const sai_switch_api_t           redis_switch_api;
-PRIVATE extern const sai_system_port_api_t      redis_system_port_api;
-PRIVATE extern const sai_tam_api_t              redis_tam_api;
-PRIVATE extern const sai_tunnel_api_t           redis_tunnel_api;
-PRIVATE extern const sai_udf_api_t              redis_udf_api;
-PRIVATE extern const sai_virtual_router_api_t   redis_virtual_router_api;
-PRIVATE extern const sai_vlan_api_t             redis_vlan_api;
-PRIVATE extern const sai_wred_api_t             redis_wred_api;
-PRIVATE extern const sai_my_mac_api_t           redis_my_mac_api;
-PRIVATE extern const sai_ipsec_api_t            redis_ipsec_api;
+PRIVATE extern const sai_acl_api_t                     redis_acl_api;
+PRIVATE extern const sai_bfd_api_t                     redis_bfd_api;
+PRIVATE extern const sai_bmtor_api_t                   redis_bmtor_api;
+PRIVATE extern const sai_generic_programmable_api_t    redis_generic_programmable_api;
+PRIVATE extern const sai_bridge_api_t                  redis_bridge_api;
+PRIVATE extern const sai_buffer_api_t                  redis_buffer_api;
+PRIVATE extern const sai_counter_api_t                 redis_counter_api;
+PRIVATE extern const sai_debug_counter_api_t           redis_debug_counter_api;
+PRIVATE extern const sai_dtel_api_t                    redis_dtel_api;
+PRIVATE extern const sai_fdb_api_t                     redis_fdb_api;
+PRIVATE extern const sai_hash_api_t                    redis_hash_api;
+PRIVATE extern const sai_hostif_api_t                  redis_hostif_api;
+PRIVATE extern const sai_ipmc_api_t                    redis_ipmc_api;
+PRIVATE extern const sai_ipmc_group_api_t              redis_ipmc_group_api;
+PRIVATE extern const sai_isolation_group_api_t         redis_isolation_group_api;
+PRIVATE extern const sai_l2mc_api_t                    redis_l2mc_api;
+PRIVATE extern const sai_l2mc_group_api_t              redis_l2mc_group_api;
+PRIVATE extern const sai_lag_api_t                     redis_lag_api;
+PRIVATE extern const sai_macsec_api_t                  redis_macsec_api;
+PRIVATE extern const sai_mcast_fdb_api_t               redis_mcast_fdb_api;
+PRIVATE extern const sai_mirror_api_t                  redis_mirror_api;
+PRIVATE extern const sai_mpls_api_t                    redis_mpls_api;
+PRIVATE extern const sai_nat_api_t                     redis_nat_api;
+PRIVATE extern const sai_neighbor_api_t                redis_neighbor_api;
+PRIVATE extern const sai_next_hop_api_t                redis_next_hop_api;
+PRIVATE extern const sai_next_hop_group_api_t          redis_next_hop_group_api;
+PRIVATE extern const sai_policer_api_t                 redis_policer_api;
+PRIVATE extern const sai_port_api_t                    redis_port_api;
+PRIVATE extern const sai_qos_map_api_t                 redis_qos_map_api;
+PRIVATE extern const sai_queue_api_t                   redis_queue_api;
+PRIVATE extern const sai_route_api_t                   redis_route_api;
+PRIVATE extern const sai_router_interface_api_t        redis_router_interface_api;
+PRIVATE extern const sai_rpf_group_api_t               redis_rpf_group_api;
+PRIVATE extern const sai_samplepacket_api_t            redis_samplepacket_api;
+PRIVATE extern const sai_scheduler_api_t               redis_scheduler_api;
+PRIVATE extern const sai_scheduler_group_api_t         redis_scheduler_group_api;
+PRIVATE extern const sai_srv6_api_t                    redis_srv6_api;
+PRIVATE extern const sai_stp_api_t                     redis_stp_api;
+PRIVATE extern const sai_switch_api_t                  redis_switch_api;
+PRIVATE extern const sai_system_port_api_t             redis_system_port_api;
+PRIVATE extern const sai_tam_api_t                     redis_tam_api;
+PRIVATE extern const sai_tunnel_api_t                  redis_tunnel_api;
+PRIVATE extern const sai_udf_api_t                     redis_udf_api;
+PRIVATE extern const sai_virtual_router_api_t          redis_virtual_router_api;
+PRIVATE extern const sai_vlan_api_t                    redis_vlan_api;
+PRIVATE extern const sai_wred_api_t                    redis_wred_api;
+PRIVATE extern const sai_my_mac_api_t                  redis_my_mac_api;
+PRIVATE extern const sai_ipsec_api_t                   redis_ipsec_api;
 
 PRIVATE extern std::shared_ptr<sairedis::SaiInterface>   redis_sai;
 

diff --git a/lib/sai_redis_genericprogrammable.cpp b/lib/sai_redis_genericprogrammable.cpp
@@ -0,0 +1,7 @@
+#include "sai_redis.h"
+
+REDIS_GENERIC_QUAD(GENERIC_PROGRAMMABLE,generic_programmable);
+
+const sai_generic_programmable_api_t redis_generic_programmable_api = {
+    REDIS_GENERIC_QUAD_API(generic_programmable)
+};
diff --git a/lib/sai_redis_interfacequery.cpp b/lib/sai_redis_interfacequery.cpp
@@ -79,6 +79,7 @@ static sai_apis_t redis_apis = {
     API(system_port),
     API(my_mac),
     API(ipsec),
+    API(generic_programmable),
     API(bmtor),
 };
 

diff --git a/lib/sai_redis_neighbor.cpp b/lib/sai_redis_neighbor.cpp
@@ -8,11 +8,13 @@ static sai_status_t redis_remove_all_neighbor_entries(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+REDIS_BULK_QUAD_ENTRY(NEIGHBOR_ENTRY,neighbor_entry);
 REDIS_GENERIC_QUAD_ENTRY(NEIGHBOR_ENTRY,neighbor_entry);
 
 const sai_neighbor_api_t redis_neighbor_api = {
 
     REDIS_GENERIC_QUAD_API(neighbor_entry)
-
     redis_remove_all_neighbor_entries,
+
+    REDIS_BULK_QUAD_API(neighbor_entry)
 };
diff --git a/lib/sai_redis_nexthopgroup.cpp b/lib/sai_redis_nexthopgroup.cpp
@@ -16,6 +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
+    redis_bulk_set_next_hop_group_members,
+    redis_bulk_get_next_hop_group_members
 };
diff --git a/lib/sai_redis_switch.cpp b/lib/sai_redis_switch.cpp
@@ -24,6 +24,30 @@ static sai_status_t redis_switch_mdio_write(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+static sai_status_t redis_switch_mdio_cl22_read(
+        _In_ sai_object_id_t switch_id,
+        _In_ uint32_t device_addr,
+        _In_ uint32_t start_reg_addr,
+        _In_ uint32_t number_of_registers,
+        _Out_ uint32_t *reg_val)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
+static sai_status_t redis_switch_mdio_cl22_write(
+        _In_ sai_object_id_t switch_id,
+        _In_ uint32_t device_addr,
+        _In_ uint32_t start_reg_addr,
+        _In_ uint32_t number_of_registers,
+        _In_ const uint32_t *reg_val)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 REDIS_GENERIC_QUAD(SWITCH,switch);
 REDIS_GENERIC_STATS(SWITCH,switch);
 REDIS_GENERIC_QUAD(SWITCH_TUNNEL,switch_tunnel);
@@ -55,4 +79,6 @@ const sai_switch_api_t redis_switch_api = {
     redis_switch_mdio_write,
 
     REDIS_GENERIC_QUAD_API(switch_tunnel)
+    redis_switch_mdio_cl22_read,
+    redis_switch_mdio_cl22_write
 };
diff --git a/lib/sai_redis_tunnel.cpp b/lib/sai_redis_tunnel.cpp
@@ -5,7 +5,7 @@ REDIS_GENERIC_QUAD(TUNNEL,tunnel);
 REDIS_GENERIC_QUAD(TUNNEL_TERM_TABLE_ENTRY,tunnel_term_table_entry);
 REDIS_GENERIC_QUAD(TUNNEL_MAP_ENTRY,tunnel_map_entry);
 REDIS_GENERIC_STATS(TUNNEL,tunnel);
-REDIS_BULK_GET_SET(TUNNEL,tunnels);
+REDIS_BULK_QUAD(TUNNEL,tunnels);
 
 const sai_tunnel_api_t redis_tunnel_api = {
 
@@ -14,5 +14,5 @@ const sai_tunnel_api_t redis_tunnel_api = {
     REDIS_GENERIC_STATS_API(tunnel)
     REDIS_GENERIC_QUAD_API(tunnel_term_table_entry)
     REDIS_GENERIC_QUAD_API(tunnel_map_entry)
-    REDIS_BULK_GET_SET_API(tunnels)
+    REDIS_BULK_QUAD_API(tunnels)
 };