Skip to content

Commit 473c990

Browse files
authored
[submodule update] SAI submodule update (sonic-net#1023)
* SAI submodule update - d0f3333 Tunnel Scoped TC MAP and Remarking (sonic-net#1413) (sonic-net#1451) - 62364a3 Add two more API as RPC for warmboot testing (sonic-net#1421) (sonic-net#1437) - 426fad1 Make saithriftv compatible with thrift 0.14.1 (sonic-net#1433) Signed-off-by: bingwang <[email protected]>
1 parent e3af0df commit 473c990

File tree

7 files changed

+42
-1
lines changed

7 files changed

+42
-1
lines changed

lib/sai_redis.h

+12
Original file line numberDiff line numberDiff line change
@@ -415,3 +415,15 @@ PRIVATE extern std::shared_ptr<sairedis::SaiInterface> redis_sai;
415415
redis_bulk_remove_ ## ot, \
416416
redis_bulk_set_ ## ot, \
417417
redis_bulk_get_ ## ot,
418+
419+
// BULK get/set DECLARE
420+
421+
#define REDIS_BULK_GET_SET(OT,ot) \
422+
REDIS_BULK_GET(OT,ot); \
423+
REDIS_BULK_SET(OT,ot);
424+
425+
// BULK get/set API
426+
427+
#define REDIS_BULK_GET_SET_API(ot) \
428+
redis_bulk_get_ ## ot, \
429+
redis_bulk_set_ ## ot,

lib/sai_redis_tunnel.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ REDIS_GENERIC_QUAD(TUNNEL,tunnel);
55
REDIS_GENERIC_QUAD(TUNNEL_TERM_TABLE_ENTRY,tunnel_term_table_entry);
66
REDIS_GENERIC_QUAD(TUNNEL_MAP_ENTRY,tunnel_map_entry);
77
REDIS_GENERIC_STATS(TUNNEL,tunnel);
8+
REDIS_BULK_GET_SET(TUNNEL,tunnels);
89

910
const sai_tunnel_api_t redis_tunnel_api = {
1011

@@ -13,4 +14,5 @@ const sai_tunnel_api_t redis_tunnel_api = {
1314
REDIS_GENERIC_STATS_API(tunnel)
1415
REDIS_GENERIC_QUAD_API(tunnel_term_table_entry)
1516
REDIS_GENERIC_QUAD_API(tunnel_map_entry)
17+
REDIS_BULK_GET_SET_API(tunnels)
1618
};

unittest/lib/test_sai_redis_tunnel.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,11 @@ TEST(libsairedis, tunnel)
3939
EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_tunnel_map_entry(0));
4040
EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tunnel_map_entry_attribute(0,0));
4141
EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tunnel_map_entry_attribute(0,0,0));
42+
43+
uint32_t attr_count = 0;
44+
sai_status_t status = 0;
45+
sai_attribute_t *p_attr = nullptr;
46+
EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tunnels_attribute(0,&id,&attr_count,&p_attr,SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR,&status));
47+
EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tunnels_attribute(0,&id,0,SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR,&status));
4248
}
49+

unittest/vslib/test_sai_vs_tunnel.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,11 @@ TEST(libsaivs, tunnel)
3939
EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_tunnel_map_entry(0));
4040
EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tunnel_map_entry_attribute(0,0));
4141
EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tunnel_map_entry_attribute(0,0,0));
42+
43+
uint32_t attr_count = 0;
44+
sai_status_t status = 0;
45+
sai_attribute_t *p_attr = nullptr;
46+
EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tunnels_attribute(0,&id,&attr_count,&p_attr,SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR,&status));
47+
EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tunnels_attribute(0,&id,0,SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR,&status));
4248
}
49+

vslib/sai_vs.h

+11
Original file line numberDiff line numberDiff line change
@@ -416,3 +416,14 @@ PRIVATE extern std::shared_ptr<sairedis::SaiInterface> vs_sai;
416416
vs_bulk_set_ ## ot, \
417417
vs_bulk_get_ ## ot,
418418

419+
// BULK get/set DECLARE for vs
420+
421+
#define VS_BULK_GET_SET(OT,ot) \
422+
VS_BULK_GET(OT,ot); \
423+
VS_BULK_SET(OT,ot);
424+
425+
// BULK get/set API for vs
426+
427+
#define VS_BULK_GET_SET_API(ot) \
428+
vs_bulk_get_ ## ot, \
429+
vs_bulk_set_ ## ot,

vslib/sai_vs_tunnel.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ VS_GENERIC_QUAD(TUNNEL,tunnel);
55
VS_GENERIC_QUAD(TUNNEL_TERM_TABLE_ENTRY,tunnel_term_table_entry);
66
VS_GENERIC_QUAD(TUNNEL_MAP_ENTRY,tunnel_map_entry);
77
VS_GENERIC_STATS(TUNNEL,tunnel);
8+
VS_BULK_GET_SET(TUNNEL,tunnels);
89

910
const sai_tunnel_api_t vs_tunnel_api = {
1011

@@ -13,4 +14,5 @@ const sai_tunnel_api_t vs_tunnel_api = {
1314
VS_GENERIC_STATS_API(tunnel)
1415
VS_GENERIC_QUAD_API(tunnel_term_table_entry)
1516
VS_GENERIC_QUAD_API(tunnel_map_entry)
17+
VS_BULK_GET_SET_API(tunnels)
1618
};

0 commit comments

Comments
 (0)