@@ -5,19 +5,50 @@ extern "C" {
55}
66
77#include " swss/logger.h"
8+ #include " swss/dbconnector.h"
9+ #include " swss/schema.h"
10+ #include " swss/redisreply.h"
811#include " sairedis.h"
912#include " sai_redis.h"
1013#include " meta/saiserialize.h"
14+ #include " syncd.h"
1115
1216#include < map>
1317#include < unordered_map>
1418#include < vector>
19+ #include < thread>
20+ #include < tuple>
1521
1622#define ASSERT_SUCCESS (format,...) \
1723 if ((status)!=SAI_STATUS_SUCCESS) \
1824 SWSS_LOG_THROW (format " : %s"
1925
20- const char * profile_get_value (
26+ static sai_next_hop_group_api_t test_next_hop_group_api;
27+ static std::vector<std::tuple<sai_object_id_t , sai_object_id_t , std::vector<sai_attribute_t >>> created_next_hop_group_member;
28+
29+ sai_status_t test_create_next_hop_group_member (
30+ _Out_ sai_object_id_t *next_hop_group_member_id,
31+ _In_ sai_object_id_t switch_id,
32+ _In_ uint32_t attr_count,
33+ _In_ const sai_attribute_t *attr_list)
34+ {
35+ created_next_hop_group_member.emplace_back ();
36+ auto & back = created_next_hop_group_member.back ();
37+ std::get<0 >(back) = *next_hop_group_member_id;
38+ std::get<1 >(back) = switch_id;
39+ auto & attrs = std::get<2 >(back);
40+ attrs.insert (attrs.end (), attr_list, attr_list + attr_count);
41+ return 0 ;
42+ }
43+
44+ void clearDB ()
45+ {
46+ swss::DBConnector db (ASIC_DB, " localhost" 6379 , 0 );
47+ swss::RedisReply r (&db, " FLUSHALL"
48+ r.checkStatusOK ();
49+ }
50+
51+ static const char * profile_get_value (
2152 _In_ sai_switch_profile_id_t profile_id,
2253 _In_ const char * variable)
2354{
@@ -26,7 +57,7 @@ const char* profile_get_value(
2657 return NULL ;
2758}
2859
29- int profile_get_next_value (
60+ static int profile_get_next_value (
3061 _In_ sai_switch_profile_id_t profile_id,
3162 _Out_ const char ** variable,
3263 _Out_ const char ** value)
@@ -50,7 +81,7 @@ int profile_get_next_value(
5081 return -1 ;
5182}
5283
53- service_method_table_t test_services = {
84+ static service_method_table_t test_services = {
5485 profile_get_value,
5586 profile_get_next_value
5687};
@@ -64,6 +95,11 @@ void test_sai_initialize()
6495 // with enabled unix socket
6596 sai_status_t status = sai_api_initialize (0 , (service_method_table_t *)&test_services);
6697
98+ // Mock the SAI api
99+ test_next_hop_group_api.create_next_hop_group_member = test_create_next_hop_group_member;
100+ sai_metadata_sai_next_hop_group_api = &test_next_hop_group_api;
101+ created_next_hop_group_member.clear ();
102+
67103 ASSERT_SUCCESS (" Failed to initialize api"
68104}
69105
@@ -100,15 +136,55 @@ sai_object_id_t create_dummy_object_id(
100136 return (((sai_object_id_t )objecttype) << 48 ) | ++index ;
101137}
102138
139+ bool starts_with (const std::string& str, const std::string& substr)
140+ {
141+ return strncmp (str.c_str (), substr.c_str (), substr.size ()) == 0 ;
142+ }
143+
144+ void bulk_nhgm_consumer_worker ()
145+ {
146+ std::string tableName = ASIC_STATE_TABLE;
147+ swss::DBConnector db (ASIC_DB, " localhost" 6379 , 0 );
148+ swss::ConsumerTable c (&db, tableName);
149+ swss::Select cs;
150+ swss::Selectable *selectcs;
151+ int tmpfd;
152+ int ret = 0 ;
153+
154+ cs.addSelectable (&c);
155+ while ((ret = cs.select (&selectcs, &tmpfd)) == swss::Select::OBJECT)
156+ {
157+ swss::KeyOpFieldsValuesTuple kco;
158+ c.pop (kco);
159+
160+ auto & key = kfvKey (kco);
161+ auto & op = kfvOp (kco);
162+ auto & values = kfvFieldsValues (kco);
163+
164+ if (starts_with (key, " SAI_OBJECT_TYPE_SWITCH" continue ;
165+
166+ if (op == " bulkcreate"
167+ {
168+ sai_status_t status = processBulkEvent ((sai_common_api_t )SAI_COMMON_API_BULK_CREATE, kco);
169+ ASSERT_SUCCESS (" Failed to processBulkEvent"
170+ break ;
171+ }
172+
173+ }
174+ }
175+
103176void test_bulk_next_hop_group_member_create ()
104177{
105178 SWSS_LOG_ENTER ();
106179
107180 swss::Logger::getInstance ().setMinPrio (swss::Logger::SWSS_NOTICE);
108181
182+ clearDB ();
109183 meta_init_db ();
110184 redis_clear_switch_ids ();
111185
186+ auto consumerThreads = new std::thread (bulk_nhgm_consumer_worker);
187+
112188 swss::Logger::getInstance ().setMinPrio (swss::Logger::SWSS_DEBUG);
113189
114190 sai_status_t status;
@@ -144,6 +220,7 @@ void test_bulk_next_hop_group_member_create()
144220 sai_object_meta_key_t meta_key_hopgruop = { .objecttype = SAI_OBJECT_TYPE_NEXT_HOP_GROUP, .objectkey = { .key = { .object_id = hopgroup } } };
145221 std::string hopgroup_key = sai_serialize_object_meta_key (meta_key_hopgruop);
146222 ObjectAttrHash[hopgroup_key] = { };
223+ sai_object_id_t hopgroup_vid = translate_rid_to_vid (hopgroup, switch_id);
147224
148225 for (uint32_t i = 0 ; i < count; ++i)
149226 {
@@ -153,15 +230,16 @@ void test_bulk_next_hop_group_member_create()
153230 sai_object_meta_key_t meta_key_hop = { .objecttype = SAI_OBJECT_TYPE_NEXT_HOP, .objectkey = { .key = { .object_id = hop } } };
154231 std::string hop_key = sai_serialize_object_meta_key (meta_key_hop);
155232 ObjectAttrHash[hop_key] = { };
233+ sai_object_id_t hop_vid = translate_rid_to_vid (hop, switch_id);
156234
157235 std::vector<sai_attribute_t > list (2 );
158236 sai_attribute_t &attr1 = list[0 ];
159237 sai_attribute_t &attr2 = list[1 ];
160238
161239 attr1.id = SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID;
162- attr1.value .oid = hopgroup ;
240+ attr1.value .oid = hopgroup_vid ;
163241 attr2.id = SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_ID;
164- attr2.value .oid = hop ;
242+ attr2.value .oid = hop_vid ;
165243 nhgm_attrs.push_back (list);
166244 nhgm_attrs_count.push_back (2 );
167245 }
@@ -181,6 +259,18 @@ void test_bulk_next_hop_group_member_create()
181259 status = statuses[j];
182260 ASSERT_SUCCESS (" Failed to create nhgm # %zu"
183261 }
262+
263+ consumerThreads->join ();
264+ delete consumerThreads;
265+
266+ // check the SAI api calling
267+ for (size_t i = 0 ; i < created_next_hop_group_member.size (); i++)
268+ {
269+ auto & created = created_next_hop_group_member[i];
270+ auto & created_attrs = std::get<2 >(created);
271+ assert (created_attrs.size () == 2 );
272+ assert (created_attrs[1 ].value .oid == nhgm_attrs[i][1 ].value .oid );
273+ }
184274}
185275
186276void test_bulk_route_set ()
@@ -189,6 +279,7 @@ void test_bulk_route_set()
189279
190280 swss::Logger::getInstance ().setMinPrio (swss::Logger::SWSS_NOTICE);
191281
282+ clearDB ();
192283 meta_init_db ();
193284 redis_clear_switch_ids ();
194285
0 commit comments