Skip to content

Commit a17e54e

Browse files
Shuotian Chenglguohan
Shuotian Cheng
authored and
lguohan
committed
[SAI]: Move SAI pointer to v1.4 (sonic-net#447)
- Remove uburst - Update tam Signed-off-by: Shu0T1an ChenG <[email protected]>
1 parent f8950b7 commit a17e54e

11 files changed

+37
-76
lines changed

‎SAI

‎lib/inc/sai_redis.h

-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ extern const sai_stp_api_t redis_stp_api;
104104
extern const sai_switch_api_t redis_switch_api;
105105
extern const sai_tam_api_t redis_tam_api;
106106
extern const sai_tunnel_api_t redis_tunnel_api;
107-
extern const sai_uburst_api_t redis_uburst_api;
108107
extern const sai_udf_api_t redis_udf_api;
109108
extern const sai_virtual_router_api_t redis_virtual_router_api;
110109
extern const sai_vlan_api_t redis_vlan_api;

‎lib/src/Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ libsairedis_la_SOURCES = \
4545
sai_redis_switch.cpp \
4646
sai_redis_tam.cpp \
4747
sai_redis_tunnel.cpp \
48-
sai_redis_uburst.cpp \
4948
sai_redis_udf.cpp \
5049
sai_redis_virtual_router.cpp \
5150
sai_redis_vlan.cpp \

‎lib/src/sai_redis_interfacequery.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ sai_status_t sai_api_query(
247247
API_CASE(SWITCH,switch);
248248
API_CASE(TAM,tam);
249249
API_CASE(TUNNEL,tunnel);
250-
API_CASE(UBURST,uburst);
251250
API_CASE(UDF,udf);
252251
API_CASE(VIRTUAL_ROUTER,virtual_router);
253252
API_CASE(VLAN,vlan);

‎lib/src/sai_redis_tam.cpp

+18-22
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
#include "sai_redis.h"
22
#include "sai_redis_internal.h"
33

4-
sai_status_t redis_get_tam_snapshot_stats(
5-
_In_ sai_object_id_t tam_snapshot_id,
6-
_Inout_ uint32_t *number_of_counters,
7-
_Inout_ sai_tam_statistic_t *statistics)
8-
{
9-
MUTEX();
10-
SWSS_LOG_ENTER();
11-
12-
return SAI_STATUS_NOT_IMPLEMENTED;
13-
}
14-
154
REDIS_GENERIC_QUAD(TAM,tam);
16-
REDIS_GENERIC_QUAD(TAM_STAT,tam_stat);
17-
REDIS_GENERIC_QUAD(TAM_THRESHOLD,tam_threshold);
18-
REDIS_GENERIC_QUAD(TAM_SNAPSHOT,tam_snapshot);
19-
REDIS_GENERIC_QUAD(TAM_TRANSPORTER,tam_transporter);
5+
REDIS_GENERIC_QUAD(TAM_MATH_FUNC,tam_math_func);
6+
REDIS_GENERIC_QUAD(TAM_REPORT,tam_report);
7+
REDIS_GENERIC_QUAD(TAM_EVENT_THRESHOLD,tam_event_threshold);
8+
REDIS_GENERIC_QUAD(TAM_TEL_TYPE,tam_tel_type);
9+
REDIS_GENERIC_QUAD(TAM_TRANSPORT,tam_transport);
10+
REDIS_GENERIC_QUAD(TAM_TELEMETRY,tam_telemetry);
11+
REDIS_GENERIC_QUAD(TAM_COLLECTOR,tam_collector);
12+
REDIS_GENERIC_QUAD(TAM_EVENT_ACTION,tam_event_action);
13+
REDIS_GENERIC_QUAD(TAM_EVENT,tam_event);
2014

2115
const sai_tam_api_t redis_tam_api = {
2216

2317
REDIS_GENERIC_QUAD_API(tam)
24-
REDIS_GENERIC_QUAD_API(tam_stat)
25-
REDIS_GENERIC_QUAD_API(tam_threshold)
26-
REDIS_GENERIC_QUAD_API(tam_snapshot)
27-
28-
redis_get_tam_snapshot_stats,
29-
30-
REDIS_GENERIC_QUAD_API(tam_transporter)
18+
REDIS_GENERIC_QUAD_API(tam_math_func)
19+
REDIS_GENERIC_QUAD_API(tam_report)
20+
REDIS_GENERIC_QUAD_API(tam_event_threshold)
21+
REDIS_GENERIC_QUAD_API(tam_tel_type)
22+
REDIS_GENERIC_QUAD_API(tam_transport)
23+
REDIS_GENERIC_QUAD_API(tam_telemetry)
24+
REDIS_GENERIC_QUAD_API(tam_collector)
25+
REDIS_GENERIC_QUAD_API(tam_event_action)
26+
REDIS_GENERIC_QUAD_API(tam_event)
3127
};

‎lib/src/sai_redis_uburst.cpp

-13
This file was deleted.

‎vslib/inc/sai_vs.h

-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ extern const sai_stp_api_t vs_stp_api;
141141
extern const sai_switch_api_t vs_switch_api;
142142
extern const sai_tam_api_t vs_tam_api;
143143
extern const sai_tunnel_api_t vs_tunnel_api;
144-
extern const sai_uburst_api_t vs_uburst_api;
145144
extern const sai_udf_api_t vs_udf_api;
146145
extern const sai_virtual_router_api_t vs_virtual_router_api;
147146
extern const sai_vlan_api_t vs_vlan_api;

‎vslib/src/Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ libsaivs_la_SOURCES = \
4545
sai_vs_switch.cpp \
4646
sai_vs_tam.cpp \
4747
sai_vs_tunnel.cpp \
48-
sai_vs_uburst.cpp \
4948
sai_vs_udf.cpp \
5049
sai_vs_virtual_router.cpp \
5150
sai_vs_vlan.cpp \

‎vslib/src/sai_vs_interfacequery.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,6 @@ sai_status_t sai_api_query(
910910
API_CASE(SWITCH,switch);
911911
API_CASE(TAM,tam);
912912
API_CASE(TUNNEL,tunnel);
913-
API_CASE(UBURST,uburst);
914913
API_CASE(UDF,udf);
915914
API_CASE(VIRTUAL_ROUTER,virtual_router);
916915
API_CASE(VLAN,vlan);

‎vslib/src/sai_vs_tam.cpp

+18-21
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,28 @@
11
#include "sai_vs.h"
22
#include "sai_vs_internal.h"
33

4-
sai_status_t vs_get_tam_snapshot_stats(
5-
_In_ sai_object_id_t tam_snapshot_id,
6-
_Inout_ uint32_t *number_of_counters,
7-
_Inout_ sai_tam_statistic_t *statistics)
8-
{
9-
MUTEX();
10-
SWSS_LOG_ENTER();
11-
12-
return SAI_STATUS_NOT_IMPLEMENTED;
13-
}
14-
154
VS_GENERIC_QUAD(TAM,tam);
16-
VS_GENERIC_QUAD(TAM_STAT,tam_stat);
17-
VS_GENERIC_QUAD(TAM_THRESHOLD,tam_threshold);
18-
VS_GENERIC_QUAD(TAM_SNAPSHOT,tam_snapshot);
19-
VS_GENERIC_QUAD(TAM_TRANSPORTER,tam_transporter);
5+
VS_GENERIC_QUAD(TAM_MATH_FUNC,tam_math_func);
6+
VS_GENERIC_QUAD(TAM_REPORT,tam_report);
7+
VS_GENERIC_QUAD(TAM_EVENT_THRESHOLD,tam_event_threshold);
8+
VS_GENERIC_QUAD(TAM_TEL_TYPE,tam_tel_type);
9+
VS_GENERIC_QUAD(TAM_TRANSPORT,tam_transport);
10+
VS_GENERIC_QUAD(TAM_TELEMETRY,tam_telemetry);
11+
VS_GENERIC_QUAD(TAM_COLLECTOR,tam_collector);
12+
VS_GENERIC_QUAD(TAM_EVENT_ACTION,tam_event_action);
13+
VS_GENERIC_QUAD(TAM_EVENT,tam_event);
2014

2115
const sai_tam_api_t vs_tam_api = {
2216

2317
VS_GENERIC_QUAD_API(tam)
24-
VS_GENERIC_QUAD_API(tam_stat)
25-
VS_GENERIC_QUAD_API(tam_threshold)
26-
VS_GENERIC_QUAD_API(tam_snapshot)
27-
28-
vs_get_tam_snapshot_stats,
18+
VS_GENERIC_QUAD_API(tam_math_func)
19+
VS_GENERIC_QUAD_API(tam_report)
20+
VS_GENERIC_QUAD_API(tam_event_threshold)
21+
VS_GENERIC_QUAD_API(tam_tel_type)
22+
VS_GENERIC_QUAD_API(tam_transport)
23+
VS_GENERIC_QUAD_API(tam_telemetry)
24+
VS_GENERIC_QUAD_API(tam_collector)
25+
VS_GENERIC_QUAD_API(tam_event_action)
26+
VS_GENERIC_QUAD_API(tam_event)
2927

30-
VS_GENERIC_QUAD_API(tam_transporter)
3128
};

‎vslib/src/sai_vs_uburst.cpp

-13
This file was deleted.

0 commit comments

Comments
 (0)