[sairedis] Remove custom bulk fdb methods (sonic-net#710)

Metaswitch · Nov 23, 2020 · 56f5a21 · 56f5a21
1 parent f1b1f05
commit 56f5a21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 54 deletions.
diff --git a/lib/src/sai_redis_fdb.cpp b/lib/src/sai_redis_fdb.cpp
@@ -16,42 +16,6 @@ static sai_status_t redis_flush_fdb_entries(
 REDIS_GENERIC_QUAD_ENTRY(FDB_ENTRY,fdb_entry);
 REDIS_BULK_QUAD_ENTRY(FDB_ENTRY,fdb_entry);
 
-// TODO remove when test corrected (SAI pointer must be advanced for this)
-
-sai_status_t sai_bulk_create_fdb_entry(
-        _In_ uint32_t object_count,
-        _In_ const sai_fdb_entry_t *fdb_entry,
-        _In_ const uint32_t *attr_count,
-        _In_ const sai_attribute_t **attr_list,
-        _In_ sai_bulk_op_error_mode_t mode,
-        _Out_ sai_status_t *object_statuses)
-{
-    SWSS_LOG_ENTER();
-
-    return redis_bulk_create_fdb_entry(
-            object_count,
-            fdb_entry,
-            attr_count,
-            attr_list,
-            mode,
-            object_statuses);
-}
-
-sai_status_t sai_bulk_remove_fdb_entry(
-        _In_ uint32_t object_count,
-        _In_ const sai_fdb_entry_t *fdb_entry,
-        _In_ sai_bulk_op_error_mode_t mode,
-        _Out_ sai_status_t *object_statuses)
-{
-    SWSS_LOG_ENTER();
-
-    return redis_bulk_remove_fdb_entry(
-            object_count,
-            fdb_entry,
-            mode,
-            object_statuses);
-}
-
 const sai_fdb_api_t redis_fdb_api = {
 
     REDIS_GENERIC_QUAD_API(fdb_entry)

diff --git a/syncd/tests.cpp b/syncd/tests.cpp
@@ -36,22 +36,6 @@ extern "C" {
 
 using namespace syncd;
 
-
-// TODO remove when SAI will introduce bulk APIs to those objects
-sai_status_t sai_bulk_create_fdb_entry(
-        _In_ uint32_t object_count,
-        _In_ const sai_fdb_entry_t *fdb_entry,
-        _In_ const uint32_t *attr_count,
-        _In_ const sai_attribute_t **attr_list,
-        _In_ sai_bulk_op_error_mode_t mode,
-        _Out_ sai_status_t *object_statuses);
-
-sai_status_t sai_bulk_remove_fdb_entry(
-        _In_ uint32_t object_count,
-        _In_ const sai_fdb_entry_t *fdb_entry,
-        _In_ sai_bulk_op_error_mode_t mode,
-        _Out_ sai_status_t *object_statuses);
-
 //static bool g_syncMode;
 
 #define ASSERT_SUCCESS(format,...) \
@@ -352,10 +336,12 @@ void test_bulk_fdb_create()
 
     sai_switch_api_t *sai_switch_api = NULL;
     sai_lag_api_t *sai_lag_api = NULL;
+    sai_fdb_api_t *sai_fdb_api = NULL;
     sai_bridge_api_t *sai_bridge_api = NULL;
     sai_virtual_router_api_t * sai_virtual_router_api = NULL;
 
     sai_api_query(SAI_API_BRIDGE, (void**)&sai_bridge_api);
+    sai_api_query(SAI_API_FDB, (void**)&sai_fdb_api);
     sai_api_query(SAI_API_LAG, (void**)&sai_lag_api);
     sai_api_query(SAI_API_SWITCH, (void**)&sai_switch_api);
     sai_api_query(SAI_API_VIRTUAL_ROUTER, (void**)&sai_virtual_router_api);
@@ -453,7 +439,7 @@ void test_bulk_fdb_create()
     }
 
     std::vector<sai_status_t> statuses(count);
-    status = sai_bulk_create_fdb_entry(count, fdbs.data(), fdb_attrs_count.data(), (const sai_attribute_t**)fdb_attrs_array.data()
+    status = sai_fdb_api->create_fdb_entries(count, fdbs.data(), fdb_attrs_count.data(), (const sai_attribute_t**)fdb_attrs_array.data()
         , SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, statuses.data());
     ASSERT_SUCCESS("Failed to create fdb");
     for (size_t j = 0; j < statuses.size(); j++)
@@ -463,7 +449,7 @@ void test_bulk_fdb_create()
     }
 
     // Remove fdb entry
-    status = sai_bulk_remove_fdb_entry(count, fdbs.data(), SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, statuses.data());
+    status = sai_fdb_api->remove_fdb_entries(count, fdbs.data(), SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, statuses.data());
     ASSERT_SUCCESS("Failed to bulk remove fdb entry");
 }