Advance SAI reference pointer to v1.5.0 (sonic-net#509)

* Provide generic stat api to switch object * Add generic api to tam_int * Provide vs generic stat api to vs switch * Add vs generic api to vs tam_int Signed-off-by: Wenda Ni <[email protected]>
dmytroxshevchuk · Sep 16, 2019 · 11b44b5 · 11b44b5
1 parent 38c6945
commit 11b44b5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/SAI b/SAI
diff --git a/lib/src/sai_redis_switch.cpp b/lib/src/sai_redis_switch.cpp
@@ -345,9 +345,12 @@ sai_status_t redis_get_switch_attribute(
 /**
  * @brief Switch method table retrieved with sai_api_query()
  */
+REDIS_GENERIC_STATS(SWITCH, switch);
+
 const sai_switch_api_t redis_switch_api = {
     redis_create_switch,
     redis_remove_switch,
     redis_set_switch_attribute,
     redis_get_switch_attribute,
+    REDIS_GENERIC_STATS_API(switch)
 };
diff --git a/lib/src/sai_redis_tam.cpp b/lib/src/sai_redis_tam.cpp
@@ -5,6 +5,7 @@ REDIS_GENERIC_QUAD(TAM,tam);
 REDIS_GENERIC_QUAD(TAM_MATH_FUNC,tam_math_func);
 REDIS_GENERIC_QUAD(TAM_REPORT,tam_report);
 REDIS_GENERIC_QUAD(TAM_EVENT_THRESHOLD,tam_event_threshold);
+REDIS_GENERIC_QUAD(TAM_INT,tam_int);
 REDIS_GENERIC_QUAD(TAM_TEL_TYPE,tam_tel_type);
 REDIS_GENERIC_QUAD(TAM_TRANSPORT,tam_transport);
 REDIS_GENERIC_QUAD(TAM_TELEMETRY,tam_telemetry);
@@ -18,6 +19,7 @@ const sai_tam_api_t redis_tam_api = {
     REDIS_GENERIC_QUAD_API(tam_math_func)
     REDIS_GENERIC_QUAD_API(tam_report)
     REDIS_GENERIC_QUAD_API(tam_event_threshold)
+    REDIS_GENERIC_QUAD_API(tam_int)
     REDIS_GENERIC_QUAD_API(tam_tel_type)
     REDIS_GENERIC_QUAD_API(tam_transport)
     REDIS_GENERIC_QUAD_API(tam_telemetry)

diff --git a/vslib/src/sai_vs_switch.cpp b/vslib/src/sai_vs_switch.cpp
@@ -326,11 +326,13 @@ sai_status_t vs_remove_switch(
 
 VS_SET(SWITCH,switch);
 VS_GET(SWITCH,switch);
+VS_GENERIC_STATS(SWITCH, switch);
 
 const sai_switch_api_t vs_switch_api = {
 
     vs_create_switch,
     vs_remove_switch,
     vs_set_switch_attribute,
     vs_get_switch_attribute,
+    VS_GENERIC_STATS_API(switch)
 };
diff --git a/vslib/src/sai_vs_tam.cpp b/vslib/src/sai_vs_tam.cpp
@@ -5,6 +5,7 @@ VS_GENERIC_QUAD(TAM,tam);
 VS_GENERIC_QUAD(TAM_MATH_FUNC,tam_math_func);
 VS_GENERIC_QUAD(TAM_REPORT,tam_report);
 VS_GENERIC_QUAD(TAM_EVENT_THRESHOLD,tam_event_threshold);
+VS_GENERIC_QUAD(TAM_INT,tam_int);
 VS_GENERIC_QUAD(TAM_TEL_TYPE,tam_tel_type);
 VS_GENERIC_QUAD(TAM_TRANSPORT,tam_transport);
 VS_GENERIC_QUAD(TAM_TELEMETRY,tam_telemetry);
@@ -18,6 +19,7 @@ const sai_tam_api_t vs_tam_api = {
     VS_GENERIC_QUAD_API(tam_math_func)
     VS_GENERIC_QUAD_API(tam_report)
     VS_GENERIC_QUAD_API(tam_event_threshold)
+    VS_GENERIC_QUAD_API(tam_int)
     VS_GENERIC_QUAD_API(tam_tel_type)
     VS_GENERIC_QUAD_API(tam_transport)
     VS_GENERIC_QUAD_API(tam_telemetry)
+916 −916		doc/DTEL/SAI-Proposal-Data-Plane-Telemetry.md
+377 −0		doc/NAT/SAI-NAT-API.md
+524 −0		doc/SAI-Proposal-Debug-Counters.md
+113 −0		doc/SAI-Proposal-Generic-Counters.md
+81 −0		doc/SAI-Proposal-Generic-Resource-Monitoring.md
+ −		doc/TAM/SAI-Proposal-TAM2.0-v2.0.docx
+59 −0		doc/behavioral model/NAT_SAI_Pipeline_Spec.md
+ −		doc/behavioral model/pipeline_nat_v1.pdf
+0 −0		doc/macsec-gearbox/dummy
+26 −1		inc/sai.h
+96 −1		inc/saiacl.h
+71 −0		inc/saibfd.h
+24 −4		inc/saibridge.h
+34 −12		inc/saibuffer.h
+219 −0		inc/saicounter.h
+482 −0		inc/saidebugcounter.h
+13 −0		inc/saifdb.h
+18 −0		inc/saihash.h
+74 −5		inc/saihostif.h
+21 −1		inc/saimirror.h
+656 −0		inc/sainat.h
+13 −0		inc/saineighbor.h
+14 −0		inc/sainexthop.h
+14 −0		inc/sainexthopgroup.h
+4 −0		inc/saiobject.h
+50 −3		inc/saiport.h
+2 −3		inc/saiqueue.h
+24 −0		inc/sairoute.h
+11 −2		inc/sairouterinterface.h
+146 −4		inc/saiswitch.h
+527 −7		inc/saitam.h
+1 −0		inc/saitunnel.h
+14 −3		inc/saitypes.h
+26 −7		inc/saivlan.h
+15 −14		meta/Doxyfile
+1 −2		meta/Makefile
+5 −0		meta/acronyms.txt
+4 −0		meta/aspell.en.pws
+40 −13		meta/parse.pl
+13 −0		meta/saimetadatatypes.h
+30 −11		meta/saisanitycheck.c
+16 −11		meta/saiserialize.c
+6 −5		meta/saiserializetest.c
+1 −1		meta/test.pm
+11 −3		test/saithrift/src/switch_sai.thrift
+166 −12		test/saithrift/src/switch_sai_rpc_server.cpp
+1,274 −0		test/saithrift/tests/saiacl.py
+808 −4		test/saithrift/tests/sail2.py
+1,901 −0		test/saithrift/tests/sail3.py
+37 −12		test/saithrift/tests/switch.py