sonic-net · lguohan · Jul 12, 2018 · Nov 3, 2017 · Nov 3, 2017 · Nov 3, 2017
diff --git a/.gitmodules b/.gitmodules
@@ -2,4 +2,4 @@
 	path = SAI
 	url = https://github.com/opencomputeproject/SAI.git
 	ignore = dirty
-	branch = v1.2
+	branch = v1.3
diff --git a/SAI b/SAI
diff --git a/configure.ac b/configure.ac
@@ -11,6 +11,8 @@ AC_PROG_CXX
 AC_PROG_LIBTOOL
 AC_HEADER_STDC
 
+AM_CONDITIONAL(sonic_asic_platform_barefoot,   test x$CONFIGURED_PLATFORM = xbarefoot)
+
 AC_ARG_ENABLE(debug,
 [  --enable-debug          turn on debugging],
 [case "${enableval}" in

diff --git a/lib/inc/sai_redis.h b/lib/inc/sai_redis.h
@@ -96,6 +96,7 @@ 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;
 extern const sai_wred_api_t             redis_wred_api;
+extern const sai_dtel_api_t             redis_dtel_api;
 
 #define UNREFERENCED_PARAMETER(X)
 

diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
@@ -15,6 +15,7 @@ libsairedis_la_SOURCES = \
 			 sai_redis_fdb.cpp \
 			 sai_redis_hash.cpp \
 			 sai_redis_hostintf.cpp \
+			 sai_redis_dtel.cpp \
 			 sai_redis_interfacequery.cpp \
 			 sai_redis_lag.cpp \
 			 sai_redis_mirror.cpp \

diff --git a/lib/src/sai_redis_bridge.cpp b/lib/src/sai_redis_bridge.cpp
@@ -13,6 +13,20 @@ sai_status_t redis_get_bridge_stats(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+sai_status_t redis_get_bridge_stats_ext(
+        _In_ sai_object_id_t bridge_id,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_bridge_stat_t *counter_ids,
+	_In_ sai_stats_mode_t mode,
+        _Out_ uint64_t *counters)
+{
+    MUTEX();
+
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 sai_status_t redis_clear_bridge_stats(
         _In_ sai_object_id_t bridge_id,
         _In_ uint32_t number_of_counters,
@@ -38,6 +52,20 @@ sai_status_t redis_get_bridge_port_stats(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+sai_status_t redis_get_bridge_port_stats_ext(
+        _In_ sai_object_id_t bridge_port_id,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_bridge_port_stat_t *counter_ids,
+	_In_ sai_stats_mode_t mode,
+        _Out_ uint64_t *counters)
+{
+    MUTEX();
+
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 sai_status_t redis_clear_bridge_port_stats(
         _In_ sai_object_id_t bridge_port_id,
         _In_ uint32_t number_of_counters,
@@ -58,10 +86,12 @@ const sai_bridge_api_t redis_bridge_api =
     REDIS_GENERIC_QUAD_API(bridge)
 
     redis_get_bridge_stats,
+    redis_get_bridge_stats_ext,
     redis_clear_bridge_stats,
 
     REDIS_GENERIC_QUAD_API(bridge_port)
 
     redis_get_bridge_port_stats,
+    redis_get_bridge_port_stats_ext,
     redis_clear_bridge_port_stats,
 };
diff --git a/lib/src/sai_redis_buffer.cpp b/lib/src/sai_redis_buffer.cpp
@@ -12,6 +12,20 @@ sai_status_t redis_clear_ingress_priority_group_stats(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+sai_status_t redis_get_ingress_priority_group_stats_ext(
+        _In_ sai_object_id_t ingress_pg_id,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_ingress_priority_group_stat_t *counter_ids,
+	_In_ sai_stats_mode_t mode,
+	_Out_ uint64_t *counters)
+{
+    MUTEX();
+
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 sai_status_t redis_get_buffer_pool_stats(
         _In_ sai_object_id_t pool_id,
         _In_ uint32_t number_of_counters,
@@ -37,6 +51,20 @@ sai_status_t redis_clear_buffer_pool_stats(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+sai_status_t redis_get_buffer_pool_stats_ext(
+        _In_ sai_object_id_t pool_id,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_buffer_pool_stat_t *counter_ids,
+	_In_ sai_stats_mode_t mode,
+	_Out_ uint64_t *counters)
+{
+    MUTEX();
+
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 REDIS_GENERIC_QUAD(BUFFER_POOL,buffer_pool);
 REDIS_GENERIC_QUAD(INGRESS_PRIORITY_GROUP,ingress_priority_group);
 REDIS_GENERIC_QUAD(BUFFER_PROFILE,buffer_profile);
@@ -48,11 +76,13 @@ const sai_buffer_api_t redis_buffer_api = {
     REDIS_GENERIC_QUAD_API(buffer_pool)
 
     redis_get_buffer_pool_stats,
+    redis_get_buffer_pool_stats_ext,
     redis_clear_buffer_pool_stats,
 
     REDIS_GENERIC_QUAD_API(ingress_priority_group)
 
     redis_get_ingress_priority_group_stats,
+    redis_get_ingress_priority_group_stats_ext,
     redis_clear_ingress_priority_group_stats,
 
     REDIS_GENERIC_QUAD_API(buffer_profile)

diff --git a/lib/src/sai_redis_dtel.cpp b/lib/src/sai_redis_dtel.cpp
@@ -0,0 +1,16 @@
+#include "sai_redis.h"
+
+REDIS_GENERIC_QUAD(DTEL,dtel);
+REDIS_GENERIC_QUAD(DTEL_QUEUE_REPORT,dtel_queue_report);
+REDIS_GENERIC_QUAD(DTEL_INT_SESSION,dtel_int_session);
+REDIS_GENERIC_QUAD(DTEL_REPORT_SESSION,dtel_report_session);
+REDIS_GENERIC_QUAD(DTEL_EVENT,dtel_event);
+
+const sai_dtel_api_t redis_dtel_api = {
+
+	REDIS_GENERIC_QUAD_API(dtel)
+    REDIS_GENERIC_QUAD_API(dtel_queue_report)
+    REDIS_GENERIC_QUAD_API(dtel_int_session)
+    REDIS_GENERIC_QUAD_API(dtel_report_session)
+    REDIS_GENERIC_QUAD_API(dtel_event)
+};
diff --git a/lib/src/sai_redis_hostintf.cpp b/lib/src/sai_redis_hostintf.cpp
@@ -2,8 +2,8 @@
 
 sai_status_t redis_recv_hostif_packet(
         _In_ sai_object_id_t hif_id,
-        _Out_ void *buffer,
         _Inout_ sai_size_t *buffer_size,
+        _Out_ void *buffer,
         _Inout_ uint32_t *attr_count,
         _Out_ sai_attribute_t *attr_list)
 {
@@ -16,10 +16,10 @@ sai_status_t redis_recv_hostif_packet(
 
 sai_status_t redis_send_hostif_packet(
         _In_ sai_object_id_t hif_id,
-        _In_ void *buffer,
         _In_ sai_size_t buffer_size,
+        _In_ const void *buffer,
         _In_ uint32_t attr_count,
-        _In_ sai_attribute_t *attr_list)
+        _In_ const sai_attribute_t *attr_list)
 {
     MUTEX();
 

diff --git a/lib/src/sai_redis_interfacequery.cpp b/lib/src/sai_redis_interfacequery.cpp
@@ -242,6 +242,7 @@ sai_status_t sai_api_query(
         API_CASE(VIRTUAL_ROUTER,virtual_router);
         API_CASE(VLAN,vlan);
         API_CASE(WRED,wred);
+        API_CASE(DTEL,dtel);
 
         default:
             SWSS_LOG_ERROR("Invalid API type %d", sai_api_id);

diff --git a/lib/src/sai_redis_policer.cpp b/lib/src/sai_redis_policer.cpp
@@ -13,6 +13,20 @@ sai_status_t redis_get_policer_stats(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+sai_status_t redis_get_policer_stats_ext(
+        _In_ sai_object_id_t policer_id,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_policer_stat_t *counter_ids,
+	_In_ sai_stats_mode_t mode,
+        _Out_ uint64_t *counters)
+{
+    MUTEX();
+
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 sai_status_t redis_clear_policer_stats(
         _In_ sai_object_id_t policer_id,
         _In_ uint32_t number_of_counters,
@@ -32,5 +46,6 @@ const sai_policer_api_t redis_policer_api = {
     REDIS_GENERIC_QUAD_API(policer)
 
     redis_get_policer_stats,
+    redis_get_policer_stats_ext,
     redis_clear_policer_stats,
 };
diff --git a/lib/src/sai_redis_port.cpp b/lib/src/sai_redis_port.cpp
@@ -12,6 +12,20 @@ sai_status_t redis_clear_port_stats(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+sai_status_t redis_get_port_stats_ext(
+        _In_ sai_object_id_t port_id,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_port_stat_t *counter_ids,
+	_In_ sai_stats_mode_t mode,
+	_Out_ uint64_t *counters)
+{
+    MUTEX();
+
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 sai_status_t redis_clear_port_all_stats(
         _In_ sai_object_id_t port_id)
 {
@@ -34,6 +48,20 @@ sai_status_t redis_clear_port_pool_stats(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+sai_status_t redis_get_port_pool_stats_ext(
+        _In_ sai_object_id_t port_pool_id,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_port_pool_stat_t *counter_ids,
+	_In_ sai_stats_mode_t mode,
+	_Out_ uint64_t *counters)
+{
+    MUTEX();
+
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 
 REDIS_GENERIC_QUAD(PORT,port);
 REDIS_GENERIC_QUAD(PORT_POOL,port_pool);
@@ -46,11 +74,13 @@ const sai_port_api_t redis_port_api = {
     REDIS_GENERIC_QUAD_API(port)
 
     redis_get_port_stats,
+    redis_get_port_stats_ext,
     redis_clear_port_stats,
     redis_clear_port_all_stats,
 
     REDIS_GENERIC_QUAD_API(port_pool)
 
     redis_get_port_pool_stats,
+    redis_get_port_pool_stats_ext,
     redis_clear_port_pool_stats
 };
diff --git a/lib/src/sai_redis_queue.cpp b/lib/src/sai_redis_queue.cpp
@@ -13,6 +13,20 @@ sai_status_t redis_clear_queue_stats(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+sai_status_t redis_get_queue_stats_ext(
+        _In_ sai_object_id_t queue_id,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_queue_stat_t *counter_ids,
+	_In_ sai_stats_mode_t mode,
+	_Out_ uint64_t *counters)
+{
+    MUTEX();
+
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 REDIS_GENERIC_QUAD(QUEUE,queue);
 
 REDIS_GENERIC_GET_STATS(QUEUE, queue);
@@ -22,5 +36,6 @@ const sai_queue_api_t redis_queue_api = {
     REDIS_GENERIC_QUAD_API(queue)
 
     redis_get_queue_stats,
+    redis_get_queue_stats_ext,
     redis_clear_queue_stats,
 };
diff --git a/lib/src/sai_redis_tunnel.cpp b/lib/src/sai_redis_tunnel.cpp
@@ -12,6 +12,20 @@ sai_status_t redis_clear_tunnel_stats(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+sai_status_t redis_get_tunnel_stats_ext(
+        _In_ sai_object_id_t tunnel_id,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_tunnel_stat_t *counter_ids,
+	_In_ sai_stats_mode_t mode,
+	_Out_ uint64_t *counters)
+{
+    MUTEX();
+
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 
 REDIS_GENERIC_QUAD(TUNNEL_MAP,tunnel_map);
 REDIS_GENERIC_QUAD(TUNNEL,tunnel);
@@ -25,6 +39,7 @@ const sai_tunnel_api_t redis_tunnel_api = {
     REDIS_GENERIC_QUAD_API(tunnel)
 
     redis_get_tunnel_stats,
+    redis_get_tunnel_stats_ext,
     redis_clear_tunnel_stats,
 
     REDIS_GENERIC_QUAD_API(tunnel_term_table_entry)

diff --git a/lib/src/sai_redis_vlan.cpp b/lib/src/sai_redis_vlan.cpp
@@ -42,6 +42,20 @@ sai_status_t redis_get_vlan_stats(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+sai_status_t redis_get_vlan_stats_ext(
+        _In_ sai_object_id_t vlan_id,
+        _In_ uint32_t number_of_counters,
+        _In_ const sai_vlan_stat_t *counter_ids,
+	_In_ sai_stats_mode_t mode,
+        _Out_ uint64_t *counters)
+{
+    MUTEX();
+
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 sai_status_t redis_clear_vlan_stats(
         _In_ sai_object_id_t vlan_id,
         _In_ uint32_t number_of_counters,
@@ -65,5 +79,6 @@ const sai_vlan_api_t redis_vlan_api = {
     redis_create_vlan_members,
     redis_remove_vlan_members,
     redis_get_vlan_stats,
+    redis_get_vlan_stats_ext,
     redis_clear_vlan_stats,
 };
+1 −1		README.md
+6 −0		debian/changelog
+1 −1		debian/control
+1 −0		debian/python-saithrift.dirs
+1 −1		debian/python-saithrift.install
+ −		doc/BFD/SAI_Change_Proposal_BFD_v0.docx
+ −		doc/BFD/SAI_Change_Proposal_BFD_v0_1.docx
+ −		doc/BFD/SAI_Change_Proposal_BFD_v0_2.docx
+1,169 −0		doc/DTEL/SAI-Proposal-Data-Plane-Telemetry.md
+ −		doc/DTEL/figures/INT.png
+ −		doc/DTEL/figures/drop.png
+ −		doc/DTEL/figures/postcard.png
+ −		doc/DTEL/figures/queue.png
+ −		doc/DTEL/figures/workflow.png
+253 −71		doc/SAI-Proposal-QinQ-VXLAN.md
+ −		doc/figures/vxlan-riot-topo.png
+5 −1		inc/sai.h
+218 −3		inc/saiacl.h
+580 −0		inc/saibfd.h
+50 −2		inc/saibridge.h
+40 −2		inc/saibuffer.h
+820 −0		inc/saidtel.h
+32 −1		inc/saifdb.h
+7 −7		inc/saihostif.h
+13 −1		inc/saimirror.h
+21 −0		inc/sainexthop.h
+54 −1		inc/saiobject.h
+20 −1		inc/saipolicer.h
+83 −3		inc/saiport.h
+21 −2		inc/saiqueue.h
+5 −5		inc/saistatus.h
+133 −2		inc/saiswitch.h
+1 −1		inc/saitam.h
+20 −1		inc/saitunnel.h
+31 −3		inc/saitypes.h
+21 −2		inc/saivlan.h
+175 −0		inc/saiwred.h
+6 −0		meta/acronyms.txt
+4 −0		meta/aspell.en.pws
+18 −5		meta/parse.pl
+25 −0		meta/saimetadatatypes.h
+86 −8		meta/saisanitycheck.c
+1 −4		meta/saiserialize.h
+2 −2		meta/saiserializetest.c
+39 −3		meta/style.pm
+2 −2		meta/utils.pm
+1 −1		test/saithrift/Makefile