SAI redis api idempotence support

.gitignore

@@ -7,24 +7,44 @@
 # Packaging Files #
 ###################
 debian/files
+debian/libsairedis-dbg/
+debian/libsairedis-dbg.debhelper.log
+debian/libsairedis-dbg.substvars
 debian/libsairedis-dev.debhelper.log
 debian/libsairedis-dev.substvars
 debian/libsairedis.debhelper.log
 debian/libsairedis.postinst.debhelper
 debian/libsairedis.postrm.debhelper
 debian/libsairedis.substvars
+debian/libsaimetadata-dbg.debhelper.log
+debian/libsaimetadata-dbg.substvars
+debian/libsaimetadata-dbg/
 debian/libsaimetadata-dev.debhelper.log
 debian/libsaimetadata-dev.substvars
 debian/libsaimetadata.debhelper.log
 debian/libsaimetadata.postinst.debhelper
 debian/libsaimetadata.postrm.debhelper
 debian/libsaimetadata.substvars
+debian/libsaivs-dbg/
+debian/libsaivs-dbg.debhelper.log
+debian/libsaivs-dbg.substvars
 debian/libsaivs-dev.debhelper.log
 debian/libsaivs-dev.substvars
 debian/libsaivs.debhelper.log
 debian/libsaivs.postinst.debhelper
 debian/libsaivs.postrm.debhelper
 debian/libsaivs.substvars
+debian/syncd-rpc-dbg.debhelper.log
+debian/syncd-rpc-dbg.substvars
+debian/syncd-rpc-dbg/
+debian/syncd-rpc.debhelper.log
+debian/syncd-vs-dbg.debhelper.log
+debian/syncd-vs-dbg.substvars
+debian/syncd-vs-dbg/
+debian/syncd-vs.debhelper.log
+debian/syncd-dbg.debhelper.log
+debian/syncd-dbg.substvars
+debian/syncd-dbg/
 debian/syncd.debhelper.log
 debian/syncd.postinst.debhelper
 debian/syncd.postrm.debhelper
@@ -57,6 +77,28 @@ stamp-h1
 m4
 config
 
+# Test Files #
+##############
+meta/test-suite.log
+meta/tests.log
+meta/tests.trs
+
+syncd/test-suite.log
+syncd/tests
+
+tests/brcm.pl.log
+tests/brcm.pl.trs
+tests/mlnx.pl.log
+tests/mlnx.pl.trs
+tests/swsslogentercheck.sh.log
+tests/swsslogentercheck.sh.trs
+tests/test-suite.log
+
+vslib/src/test-suite.log
+vslib/src/tests
+vslib/src/tests.log
+vslib/src/tests.trs
+
 # Dependency Folder #
 #####################
 deps/
@@ -65,10 +107,12 @@ deps/
 ###############
 syncd/syncd
 syncd/syncd_request_shutdown
+saidiscovery/saidiscovery
 saiplayer/saiplayer
 saidump/saidump
 saisdkdump/saisdkdump
 meta/tests
+tests/vssyncd
 
 # Temporary files #
 ###################

.gitmodules

@@ -2,4 +2,4 @@
 	path = SAI
 	url = https://github.com/opencomputeproject/SAI.git
 	ignore = dirty
-	branch = v1.2
+	branch = v1.3

configure.ac

@@ -11,6 +11,9 @@ AC_PROG_CXX
 AC_PROG_LIBTOOL
 AC_HEADER_STDC
 
+AM_CONDITIONAL(sonic_asic_platform_barefoot,   test x$CONFIGURED_PLATFORM = xbarefoot)
+AM_CONDITIONAL(sonic_asic_platform_mellanox,   test x$CONFIGURED_PLATFORM = xmellanox)
+
 AC_ARG_ENABLE(debug,
 [  --enable-debug          turn on debugging],
 [case "${enableval}" in

debian/libsairedis-dev.install

@@ -1 +1,2 @@
 lib/inc/sairedis.h usr/include/sai
+lib/inc/sai_redis_idempotent.h usr/include/sai

debian/libsaivs-dev.install

@@ -1 +1,2 @@
 SAI/inc/*.h usr/include/sai/
+SAI/experimental/*.h usr/include/sai/

lib/inc/sai_redis.h

@@ -23,6 +23,7 @@ extern "C" {
 #include "swss/select.h"
 #include "swss/logger.h"
 #include "meta/sai_meta.h"
+#include "swss/warm_restart.h"
 
 /*
  * Switch index is encoded on 1 byte so we can have
@@ -50,7 +51,7 @@ extern void clear_local_state();
 extern void setRecording(bool record);
 extern sai_status_t setRecordingOutputDir(
         _In_ const sai_attribute_t &attr);
-extern void recordLine(std::string s);
+extern void recordLine(const std::string &s);
 extern std::string joinFieldValues(
         _In_ const std::vector<swss::FieldValueTuple> &values);
 
@@ -70,13 +71,22 @@ extern std::shared_ptr<swss::RedisClient>           g_redisClient;
 extern std::mutex g_apimutex;
 
 extern const sai_acl_api_t              redis_acl_api;
-extern const sai_buffer_api_t           redis_buffer_api;
+extern const sai_bfd_api_t              redis_bfd_api;
+extern const sai_bmtor_api_t            redis_bmtor_api;
 extern const sai_bridge_api_t           redis_bridge_api;
+extern const sai_buffer_api_t           redis_buffer_api;
+extern const sai_dtel_api_t             redis_dtel_api;
 extern const sai_fdb_api_t              redis_fdb_api;
 extern const sai_hash_api_t             redis_hash_api;
 extern const sai_hostif_api_t           redis_hostif_api;
+extern const sai_ipmc_api_t             redis_ipmc_api;
+extern const sai_ipmc_group_api_t       redis_ipmc_group_api;
+extern const sai_l2mc_api_t             redis_l2mc_api;
+extern const sai_l2mc_group_api_t       redis_l2mc_group_api;
 extern const sai_lag_api_t              redis_lag_api;
+extern const sai_mcast_fdb_api_t        redis_mcast_fdb_api;
 extern const sai_mirror_api_t           redis_mirror_api;
+extern const sai_mpls_api_t             redis_mpls_api;
 extern const sai_neighbor_api_t         redis_neighbor_api;
 extern const sai_next_hop_api_t         redis_next_hop_api;
 extern const sai_next_hop_group_api_t   redis_next_hop_group_api;
@@ -86,12 +96,16 @@ extern const sai_qos_map_api_t          redis_qos_map_api;
 extern const sai_queue_api_t            redis_queue_api;
 extern const sai_route_api_t            redis_route_api;
 extern const sai_router_interface_api_t redis_router_interface_api;
+extern const sai_rpf_group_api_t        redis_rpf_group_api;
 extern const sai_samplepacket_api_t     redis_samplepacket_api;
 extern const sai_scheduler_api_t        redis_scheduler_api;
 extern const sai_scheduler_group_api_t  redis_scheduler_group_api;
+extern const sai_segmentroute_api_t     redis_segmentroute_api;
 extern const sai_stp_api_t              redis_stp_api;
 extern const sai_switch_api_t           redis_switch_api;
+extern const sai_tam_api_t              redis_tam_api;
 extern const sai_tunnel_api_t           redis_tunnel_api;
+extern const sai_uburst_api_t           redis_uburst_api;
 extern const sai_udf_api_t              redis_udf_api;
 extern const sai_virtual_router_api_t   redis_virtual_router_api;
 extern const sai_vlan_api_t             redis_vlan_api;
@@ -110,36 +124,76 @@ const sai_attribute_t* redis_get_attribute_by_id(
         _In_ const sai_attribute_t *attr_list);
 
 sai_object_id_t redis_create_virtual_object_id(
-        _In_ sai_object_type_t object_type);
+        _In_ sai_object_type_t object_type,
+        _In_ sai_object_id_t switch_id);
 
 void translate_rid_to_vid(
         _In_ sai_object_type_t object_type,
         _In_ uint32_t attr_count,
         _In_ sai_attribute_t *attr_list);
 
-// CREATE
+// OID QUAD
 
 sai_status_t redis_generic_create(
         _In_ sai_object_type_t object_type,
-        _Out_ sai_object_id_t* object_id,
+        _Out_ sai_object_id_t *object_id,
         _In_ sai_object_id_t switch_id,
         _In_ uint32_t attr_count,
         _In_ const sai_attribute_t *attr_list);
 
-sai_status_t redis_generic_create_fdb_entry(
-        _In_ const sai_fdb_entry_t *fdb_entry,
-        _In_ uint32_t attr_count,
-        _In_ const sai_attribute_t *attr_list);
+sai_status_t redis_generic_remove(
+        _In_ sai_object_type_t object_type,
+        _In_ sai_object_id_t object_id);
 
-sai_status_t redis_generic_create_neighbor_entry(
-        _In_ const sai_neighbor_entry_t* neighbor_entry,
-        _In_ uint32_t attr_count,
-        _In_ const sai_attribute_t *attr_list);
+sai_status_t redis_generic_set(
+        _In_ sai_object_type_t object_type,
+        _In_ sai_object_id_t object_id,
+        _In_ const sai_attribute_t *attr);
 
-sai_status_t redis_generic_create_route_entry(
-        _In_ const sai_route_entry_t* route_entry,
+sai_status_t redis_generic_get(
+        _In_ sai_object_type_t object_type,
+        _In_ sai_object_id_t object_id,
         _In_ uint32_t attr_count,
-        _In_ const sai_attribute_t *attr_list);
+        _Out_ sai_attribute_t *attr_list);
+
+// ENTRY QUAD
+
+#define REDIS_CREATE_ENTRY_DEF(ot)                  \
+    sai_status_t redis_generic_create_ ## ot(       \
+            _In_ const sai_ ## ot ## _t * ot,       \
+            _In_ uint32_t attr_count,               \
+            _In_ const sai_attribute_t *attr_list);
+
+#define REDIS_REMOVE_ENTRY_DEF(ot)                  \
+    sai_status_t redis_generic_remove_ ## ot(       \
+            _In_ const sai_ ## ot ## _t * ot);
+
+#define REDIS_SET_ENTRY_DEF(ot)                     \
+    sai_status_t redis_generic_set_ ## ot(          \
+            _In_ const sai_ ## ot ## _t * ot,       \
+            _In_ const sai_attribute_t *attr);
+
+#define REDIS_GET_ENTRY_DEF(ot)                     \
+    sai_status_t redis_generic_get_ ## ot(          \
+            _In_ const sai_ ## ot ## _t * ot,       \
+            _In_ uint32_t attr_count,               \
+            _Out_ sai_attribute_t *attr_list);
+
+#define REDIS_ENTRY_QUAD(ot)       \
+    REDIS_CREATE_ENTRY_DEF(ot)     \
+    REDIS_REMOVE_ENTRY_DEF(ot)     \
+    REDIS_SET_ENTRY_DEF(ot)        \
+    REDIS_GET_ENTRY_DEF(ot)
+
+REDIS_ENTRY_QUAD(fdb_entry);
+REDIS_ENTRY_QUAD(inseg_entry);
+REDIS_ENTRY_QUAD(ipmc_entry);
+REDIS_ENTRY_QUAD(l2mc_entry);
+REDIS_ENTRY_QUAD(mcast_fdb_entry);
+REDIS_ENTRY_QUAD(neighbor_entry);
+REDIS_ENTRY_QUAD(route_entry);
+
+// BULK
 
 sai_status_t redis_bulk_generic_create(
         _In_ sai_object_type_t object_type,
@@ -148,29 +202,14 @@ sai_status_t redis_bulk_generic_create(
         _In_ sai_object_id_t switch_id,
         _In_ const uint32_t *attr_count, /* array */
         _In_ const sai_attribute_t *const *attr_list, /* array */
-        _Inout_ sai_status_t *object_statuses) /* array */;
+        _Inout_ sai_status_t *object_statuses); /* array */
 
 sai_status_t internal_redis_bulk_generic_create(
         _In_ sai_object_type_t object_type,
         _In_ const std::vector<std::string> &serialized_object_ids,
         _In_ const uint32_t *attr_count,
-        _In_ const sai_attribute_t *const *attr_list,
-        _Inout_ sai_status_t *object_statuses);
-
-// REMOVE
-
-sai_status_t redis_generic_remove(
-        _In_ sai_object_type_t object_type,
-        _In_ sai_object_id_t object_id);
-
-sai_status_t redis_generic_remove_fdb_entry(
-        _In_ const sai_fdb_entry_t* fdb_entry);
-
-sai_status_t redis_generic_remove_neighbor_entry(
-        _In_ const sai_neighbor_entry_t* neighbor_entry);
-
-sai_status_t redis_generic_remove_route_entry(
-        _In_ const sai_route_entry_t* route_entry);
+        _In_ const sai_attribute_t *const *attr_list, /* array */
+        _Inout_ sai_status_t *object_statuses) /* array */;
 
 sai_status_t redis_bulk_generic_remove(
         _In_ sai_object_type_t object_type,
@@ -181,55 +220,13 @@ sai_status_t redis_bulk_generic_remove(
 sai_status_t internal_redis_bulk_generic_remove(
         _In_ sai_object_type_t object_type,
         _In_ const std::vector<std::string> &serialized_object_ids,
-        _Out_ sai_status_t *object_statuses) /* array */;
-
-// SET
-
-sai_status_t redis_generic_set(
-        _In_ sai_object_type_t object_type,
-        _In_ sai_object_id_t object_id,
-        _In_ const sai_attribute_t *attr);
-
-sai_status_t redis_generic_set_fdb_entry(
-        _In_ const sai_fdb_entry_t *fdb_entry,
-        _In_ const sai_attribute_t *attr);
-
-sai_status_t redis_generic_set_neighbor_entry(
-        _In_ const sai_neighbor_entry_t* neighbor_entry,
-        _In_ const sai_attribute_t *attr);
-
-sai_status_t redis_generic_set_route_entry(
-        _In_ const sai_route_entry_t* route_entry,
-        _In_ const sai_attribute_t *attr);
+        _Out_ sai_status_t *object_statuses); /* array */
 
 sai_status_t internal_redis_bulk_generic_set(
         _In_ sai_object_type_t object_type,
         _In_ const std::vector<std::string> &serialized_object_ids,
-        _In_ const sai_attribute_t *attr_list,
-        _In_ const sai_status_t *object_statuses);
-
-// GET
-
-sai_status_t redis_generic_get(
-        _In_ sai_object_type_t object_type,
-        _In_ sai_object_id_t object_id,
-        _In_ uint32_t attr_count,
-        _Out_ sai_attribute_t *attr_list);
-
-sai_status_t redis_generic_get_fdb_entry(
-        _In_ const sai_fdb_entry_t *fdb_entry,
-        _In_ uint32_t attr_count,
-        _Out_ sai_attribute_t *attr_list);
-
-sai_status_t redis_generic_get_neighbor_entry(
-        _In_ const sai_neighbor_entry_t* neighbor_entry,
-        _In_ uint32_t attr_count,
-        _Out_ sai_attribute_t *attr_list);
-
-sai_status_t redis_generic_get_route_entry(
-        _In_ const sai_route_entry_t* route_entry,
-        _In_ uint32_t attr_count,
-        _Out_ sai_attribute_t *attr_list);
+        _In_ const sai_attribute_t *attr_list, /* array */
+        _In_ const sai_status_t *object_statuses); /* array */
 
 // get_stats
 
@@ -248,4 +245,30 @@ void handle_notification(
         _In_ const std::string &data,
         _In_ const std::vector<swss::FieldValueTuple> &values);
 
+// STATS
+
+sai_status_t redis_generic_get_stats(
+        _In_ sai_object_type_t object_type,
+        _In_ sai_object_id_t object_id,
+        _In_ const sai_enum_metadata_t *enum_metadata,
+        _In_ uint32_t number_of_counters,
+        _In_ const int32_t *counter_ids,
+        _Out_ uint64_t *counters);
+
+sai_status_t redis_generic_get_stats_ext(
+        _In_ sai_object_type_t object_type,
+        _In_ sai_object_id_t object_id,
+        _In_ const sai_enum_metadata_t *enum_metadata,
+        _In_ uint32_t number_of_counters,
+        _In_ const int32_t *counter_ids,
+        _In_ sai_stats_mode_t mode,
+        _Out_ uint64_t *counters);
+
+sai_status_t redis_generic_clear_stats(
+        _In_ sai_object_type_t object_type,
+        _In_ sai_object_id_t object_id,
+        _In_ const sai_enum_metadata_t *enum_metadata,
+        _In_ uint32_t number_of_counters,
+        _In_ const int32_t *counter_ids);
+
 #endif // __SAI_REDIS__