Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[submodule update] SAI submodule update #1023

Merged
merged 7 commits into from
Mar 31, 2022
Merged

[submodule update] SAI submodule update #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2db29d1
SAI submodule update
bingwang-ms Mar 23, 2022
557604e
Fix build issue
bingwang-ms Mar 28, 2022
b75c71e
Fix build issue
bingwang-ms Mar 28, 2022
d8f2a89
Update UT
bingwang-ms Mar 28, 2022
3111a47
Update UT
bingwang-ms Mar 28, 2022
e8ab4be
Remove UT
bingwang-ms Mar 28, 2022
1f0609b
Update UT
bingwang-ms Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SAI
Open in desktop
Submodule SAI updated 8 files
+50 −0 inc/saiswitch.h
+52 −0 inc/saitunnel.h
+1 −0 inc/saitypes.h
+18 −0 meta/sai_rpc_frontend.cpp
+3 −1 meta/templates/sai_rpc_server_functions.tt
+2 −0 meta/templates/sai_thrift_utils.tt
+38 −0 ptf/sai_utils.py
+3 −5 test/saithriftv2/Makefile
12 changes: 12 additions & 0 deletions lib/sai_redis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,3 +415,15 @@ PRIVATE extern std::shared_ptr<sairedis::SaiInterface> redis_sai;
redis_bulk_remove_ ## ot, \
redis_bulk_set_ ## ot, \
redis_bulk_get_ ## ot,

// BULK get/set DECLARE

#define REDIS_BULK_GET_SET(OT,ot) \
REDIS_BULK_GET(OT,ot); \
REDIS_BULK_SET(OT,ot);

// BULK get/set API

#define REDIS_BULK_GET_SET_API(ot) \
redis_bulk_get_ ## ot, \
redis_bulk_set_ ## ot,
2 changes: 2 additions & 0 deletions lib/sai_redis_tunnel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ REDIS_GENERIC_QUAD(TUNNEL,tunnel);
REDIS_GENERIC_QUAD(TUNNEL_TERM_TABLE_ENTRY,tunnel_term_table_entry);
REDIS_GENERIC_QUAD(TUNNEL_MAP_ENTRY,tunnel_map_entry);
REDIS_GENERIC_STATS(TUNNEL,tunnel);
REDIS_BULK_GET_SET(TUNNEL,tunnels);

const sai_tunnel_api_t redis_tunnel_api = {

Expand All @@ -13,4 +14,5 @@ const sai_tunnel_api_t redis_tunnel_api = {
REDIS_GENERIC_STATS_API(tunnel)
REDIS_GENERIC_QUAD_API(tunnel_term_table_entry)
REDIS_GENERIC_QUAD_API(tunnel_map_entry)
REDIS_BULK_GET_SET_API(tunnels)
};
7 changes: 7 additions & 0 deletions unittest/lib/test_sai_redis_tunnel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,11 @@ TEST(libsairedis, tunnel)
EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_tunnel_map_entry(0));
EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tunnel_map_entry_attribute(0,0));
EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tunnel_map_entry_attribute(0,0,0));

uint32_t attr_count = 0;
sai_status_t status = 0;
sai_attribute_t *p_attr = nullptr;
EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tunnels_attribute(0,&id,&attr_count,&p_attr,SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR,&status));
EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tunnels_attribute(0,&id,0,SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR,&status));
}

7 changes: 7 additions & 0 deletions unittest/vslib/test_sai_vs_tunnel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,11 @@ TEST(libsaivs, tunnel)
EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_tunnel_map_entry(0));
EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tunnel_map_entry_attribute(0,0));
EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tunnel_map_entry_attribute(0,0,0));

uint32_t attr_count = 0;
sai_status_t status = 0;
sai_attribute_t *p_attr = nullptr;
EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tunnels_attribute(0,&id,&attr_count,&p_attr,SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR,&status));
EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tunnels_attribute(0,&id,0,SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR,&status));
}

11 changes: 11 additions & 0 deletions vslib/sai_vs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,3 +416,14 @@ PRIVATE extern std::shared_ptr<sairedis::SaiInterface> vs_sai;
vs_bulk_set_ ## ot, \
vs_bulk_get_ ## ot,

// BULK get/set DECLARE for vs

#define VS_BULK_GET_SET(OT,ot) \
VS_BULK_GET(OT,ot); \
VS_BULK_SET(OT,ot);

// BULK get/set API for vs

#define VS_BULK_GET_SET_API(ot) \
vs_bulk_get_ ## ot, \
vs_bulk_set_ ## ot,
2 changes: 2 additions & 0 deletions vslib/sai_vs_tunnel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ VS_GENERIC_QUAD(TUNNEL,tunnel);
VS_GENERIC_QUAD(TUNNEL_TERM_TABLE_ENTRY,tunnel_term_table_entry);
VS_GENERIC_QUAD(TUNNEL_MAP_ENTRY,tunnel_map_entry);
VS_GENERIC_STATS(TUNNEL,tunnel);
VS_BULK_GET_SET(TUNNEL,tunnels);
bingwang-ms marked this conversation as resolved.
Show resolved Hide resolved

const sai_tunnel_api_t vs_tunnel_api = {

Expand All @@ -13,4 +14,5 @@ const sai_tunnel_api_t vs_tunnel_api = {
VS_GENERIC_STATS_API(tunnel)
VS_GENERIC_QUAD_API(tunnel_term_table_entry)
VS_GENERIC_QUAD_API(tunnel_map_entry)
VS_BULK_GET_SET_API(tunnels)
};