diff --git a/lib/ClientSai.cpp b/lib/ClientSai.cpp index 4390dd4efcfb..efd7a22887ab 100644 --- a/lib/ClientSai.cpp +++ b/lib/ClientSai.cpp @@ -308,14 +308,7 @@ sai_status_t ClientSai::create( \ attr_list); \ } -DECLARE_CREATE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_CREATE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_CREATE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_CREATE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_CREATE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_CREATE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_CREATE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_CREATE_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_CREATE_ENTRY); #define DECLARE_REMOVE_ENTRY(OT,ot) \ sai_status_t ClientSai::remove( \ @@ -329,14 +322,7 @@ sai_status_t ClientSai::remove( \ sai_serialize_ ## ot(*ot)); \ } -DECLARE_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_REMOVE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_REMOVE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_REMOVE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_REMOVE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_REMOVE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_REMOVE_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_REMOVE_ENTRY); #define DECLARE_SET_ENTRY(OT,ot) \ sai_status_t ClientSai::set( \ @@ -352,14 +338,7 @@ sai_status_t ClientSai::set( \ attr); \ } -DECLARE_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_SET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_SET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_SET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_SET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_SET_ENTRY); #define DECLARE_GET_ENTRY(OT,ot) \ sai_status_t ClientSai::get( \ @@ -377,14 +356,7 @@ sai_status_t ClientSai::get( \ attr_list); \ } -DECLARE_GET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_GET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_GET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_GET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_GET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_GET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_GET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_GET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_GET_ENTRY); // QUAD API HELPERS diff --git a/lib/ClientServerSai.cpp b/lib/ClientServerSai.cpp index 40906a90a655..93b3514ce984 100644 --- a/lib/ClientServerSai.cpp +++ b/lib/ClientServerSai.cpp @@ -185,15 +185,7 @@ sai_status_t ClientServerSai::create( \ return m_sai->create(entry, attr_count, attr_list); \ } -DECLARE_CREATE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_CREATE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_CREATE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_CREATE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_CREATE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_CREATE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_CREATE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_CREATE_ENTRY(NAT_ENTRY,nat_entry); - +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_CREATE_ENTRY); #define DECLARE_REMOVE_ENTRY(OT,ot) \ sai_status_t ClientServerSai::remove( \ @@ -205,14 +197,7 @@ sai_status_t ClientServerSai::remove( \ return m_sai->remove(entry); \ } -DECLARE_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_REMOVE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_REMOVE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_REMOVE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_REMOVE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_REMOVE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_REMOVE_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_REMOVE_ENTRY); #define DECLARE_SET_ENTRY(OT,ot) \ sai_status_t ClientServerSai::set( \ @@ -225,14 +210,7 @@ sai_status_t ClientServerSai::set( \ return m_sai->set(entry, attr); \ } -DECLARE_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_SET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_SET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_SET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_SET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_SET_ENTRY); #define DECLARE_GET_ENTRY(OT,ot) \ sai_status_t ClientServerSai::get( \ @@ -246,14 +224,7 @@ sai_status_t ClientServerSai::get( \ return m_sai->get(entry, attr_count, attr_list); \ } -DECLARE_GET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_GET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_GET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_GET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_GET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_GET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_GET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_GET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_GET_ENTRY); // STATS @@ -404,11 +375,7 @@ sai_status_t ClientServerSai::bulkCreate( \ object_statuses); \ } -DECLARE_BULK_CREATE_ENTRY(ROUTE_ENTRY,route_entry) -DECLARE_BULK_CREATE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_CREATE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_CREATE_ENTRY(NAT_ENTRY,nat_entry) - +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_CREATE_ENTRY); // BULK REMOVE @@ -429,10 +396,7 @@ sai_status_t ClientServerSai::bulkRemove( \ object_statuses); \ } -DECLARE_BULK_REMOVE_ENTRY(ROUTE_ENTRY,route_entry) -DECLARE_BULK_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_REMOVE_ENTRY(NAT_ENTRY,nat_entry) +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_REMOVE_ENTRY); // BULK SET @@ -455,10 +419,7 @@ sai_status_t ClientServerSai::bulkSet( \ object_statuses); \ } -DECLARE_BULK_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_BULK_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_SET_ENTRY); // NON QUAD API diff --git a/lib/Recorder.cpp b/lib/Recorder.cpp index 2102bc475f16..7e7280f9729c 100644 --- a/lib/Recorder.cpp +++ b/lib/Recorder.cpp @@ -3,6 +3,7 @@ #include "meta/sai_serialize.h" #include "meta/SaiAttributeList.h" #include "meta/Globals.h" +#include "meta/SaiInterface.h" #include #include @@ -872,17 +873,7 @@ void Recorder::recordRemove( \ recordRemove(SAI_OBJECT_TYPE_ ## OT, sai_serialize_ ## ot(*ot)); \ } -#define REDIS_DECLARE_EVERY_ENTRY(_X) \ - _X(FDB_ENTRY,fdb_entry); \ - _X(INSEG_ENTRY,inseg_entry); \ - _X(IPMC_ENTRY,ipmc_entry); \ - _X(L2MC_ENTRY,l2mc_entry); \ - _X(MCAST_FDB_ENTRY,mcast_fdb_entry); \ - _X(NEIGHBOR_ENTRY,neighbor_entry); \ - _X(ROUTE_ENTRY,route_entry); \ - _X(NAT_ENTRY,nat_entry); \ - -REDIS_DECLARE_EVERY_ENTRY(DECLARE_RECORD_REMOVE_ENTRY) +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_RECORD_REMOVE_ENTRY); #define DECLARE_RECORD_CREATE_ENTRY(OT,ot) \ void Recorder::recordCreate( \ @@ -894,7 +885,7 @@ void Recorder::recordCreate( recordCreate(SAI_OBJECT_TYPE_ ## OT, sai_serialize_ ## ot(*ot), attr_count, attr_list); \ } -REDIS_DECLARE_EVERY_ENTRY(DECLARE_RECORD_CREATE_ENTRY) +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_RECORD_CREATE_ENTRY); #define DECLARE_RECORD_SET_ENTRY(OT,ot) \ void Recorder::recordSet( \ @@ -905,7 +896,7 @@ void Recorder::recordSet( recordSet(SAI_OBJECT_TYPE_ ## OT, sai_serialize_ ## ot(*ot), attr); \ } -REDIS_DECLARE_EVERY_ENTRY(DECLARE_RECORD_SET_ENTRY) +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_RECORD_SET_ENTRY); #define DECLARE_RECORD_GET_ENTRY(OT,ot) \ void Recorder::recordGet( \ @@ -917,7 +908,7 @@ void Recorder::recordGet( recordGet(SAI_OBJECT_TYPE_ ## OT, sai_serialize_ ## ot(*ot), attr_count, attr_list); \ } -REDIS_DECLARE_EVERY_ENTRY(DECLARE_RECORD_GET_ENTRY) +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_RECORD_GET_ENTRY); void Recorder::recordObjectTypeGetAvailability( _In_ sai_object_id_t switchId, diff --git a/lib/RedisRemoteSaiInterface.cpp b/lib/RedisRemoteSaiInterface.cpp index 856430cb6a65..3c0870bcabd8 100644 --- a/lib/RedisRemoteSaiInterface.cpp +++ b/lib/RedisRemoteSaiInterface.cpp @@ -545,14 +545,7 @@ sai_status_t RedisRemoteSaiInterface::remove( \ sai_serialize_ ## ot(*ot)); \ } -DECLARE_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_REMOVE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_REMOVE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_REMOVE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_REMOVE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_REMOVE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_REMOVE_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_REMOVE_ENTRY); #define DECLARE_CREATE_ENTRY(OT,ot) \ sai_status_t RedisRemoteSaiInterface::create( \ @@ -568,14 +561,7 @@ sai_status_t RedisRemoteSaiInterface::create( \ attr_list); \ } -DECLARE_CREATE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_CREATE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_CREATE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_CREATE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_CREATE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_CREATE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_CREATE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_CREATE_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_CREATE_ENTRY); #define DECLARE_SET_ENTRY(OT,ot) \ sai_status_t RedisRemoteSaiInterface::set( \ @@ -589,14 +575,7 @@ sai_status_t RedisRemoteSaiInterface::set( \ attr); \ } -DECLARE_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_SET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_SET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_SET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_SET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_SET_ENTRY); sai_status_t RedisRemoteSaiInterface::create( _In_ sai_object_type_t object_type, @@ -814,14 +793,7 @@ sai_status_t RedisRemoteSaiInterface::get( \ attr_list); \ } -DECLARE_GET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_GET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_GET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_GET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_GET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_GET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_GET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_GET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_GET_ENTRY); sai_status_t RedisRemoteSaiInterface::waitForFlushFdbEntriesResponse() { diff --git a/lib/Sai.cpp b/lib/Sai.cpp index 1fa18341fec0..3f146efd2c6f 100644 --- a/lib/Sai.cpp +++ b/lib/Sai.cpp @@ -27,7 +27,7 @@ using namespace std::placeholders; #define REDIS_CHECK_POINTER(pointer) \ if ((pointer) == nullptr) { \ - SWSS_LOG_ERROR("entry pointer " # pointer " is null"); \ + SWSS_LOG_ERROR("entry pointer " # pointer " is null"); \ return SAI_STATUS_INVALID_PARAMETER; } Sai::Sai() @@ -282,15 +282,7 @@ sai_status_t Sai::create( \ return context->m_meta->create(entry, attr_count, attr_list); \ } -DECLARE_CREATE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_CREATE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_CREATE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_CREATE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_CREATE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_CREATE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_CREATE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_CREATE_ENTRY(NAT_ENTRY,nat_entry); - +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_CREATE_ENTRY); #define DECLARE_REMOVE_ENTRY(OT,ot) \ sai_status_t Sai::remove( \ @@ -304,14 +296,7 @@ sai_status_t Sai::remove( \ return context->m_meta->remove(entry); \ } -DECLARE_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_REMOVE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_REMOVE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_REMOVE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_REMOVE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_REMOVE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_REMOVE_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_REMOVE_ENTRY); #define DECLARE_SET_ENTRY(OT,ot) \ sai_status_t Sai::set( \ @@ -321,19 +306,12 @@ sai_status_t Sai::set( \ MUTEX(); \ SWSS_LOG_ENTER(); \ REDIS_CHECK_API_INITIALIZED(); \ - REDIS_CHECK_POINTER(entry) \ + REDIS_CHECK_POINTER(entry) \ REDIS_CHECK_CONTEXT(entry->switch_id); \ return context->m_meta->set(entry, attr); \ } -DECLARE_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_SET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_SET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_SET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_SET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_SET_ENTRY); #define DECLARE_GET_ENTRY(OT,ot) \ sai_status_t Sai::get( \ @@ -349,14 +327,7 @@ sai_status_t Sai::get( \ return context->m_meta->get(entry, attr_count, attr_list); \ } -DECLARE_GET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_GET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_GET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_GET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_GET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_GET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_GET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_GET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_GET_ENTRY); // STATS @@ -516,11 +487,7 @@ sai_status_t Sai::bulkCreate( \ object_statuses); \ } -DECLARE_BULK_CREATE_ENTRY(ROUTE_ENTRY,route_entry) -DECLARE_BULK_CREATE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_CREATE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_CREATE_ENTRY(NAT_ENTRY,nat_entry) - +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_CREATE_ENTRY); // BULK REMOVE @@ -543,10 +510,7 @@ sai_status_t Sai::bulkRemove( \ object_statuses); \ } -DECLARE_BULK_REMOVE_ENTRY(ROUTE_ENTRY,route_entry) -DECLARE_BULK_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_REMOVE_ENTRY(NAT_ENTRY,nat_entry) +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_REMOVE_ENTRY); // BULK SET @@ -571,10 +535,7 @@ sai_status_t Sai::bulkSet( \ object_statuses); \ } -DECLARE_BULK_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_BULK_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_SET_ENTRY); // NON QUAD API diff --git a/lib/ServerSai.cpp b/lib/ServerSai.cpp index e84bc9322a60..eecf5fb03103 100644 --- a/lib/ServerSai.cpp +++ b/lib/ServerSai.cpp @@ -207,15 +207,7 @@ sai_status_t ServerSai::create( \ return m_sai->create(entry, attr_count, attr_list); \ } -DECLARE_CREATE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_CREATE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_CREATE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_CREATE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_CREATE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_CREATE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_CREATE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_CREATE_ENTRY(NAT_ENTRY,nat_entry); - +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_CREATE_ENTRY); #define DECLARE_REMOVE_ENTRY(OT,ot) \ sai_status_t ServerSai::remove( \ @@ -227,14 +219,7 @@ sai_status_t ServerSai::remove( \ return m_sai->remove(entry); \ } -DECLARE_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_REMOVE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_REMOVE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_REMOVE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_REMOVE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_REMOVE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_REMOVE_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_REMOVE_ENTRY); #define DECLARE_SET_ENTRY(OT,ot) \ sai_status_t ServerSai::set( \ @@ -247,14 +232,7 @@ sai_status_t ServerSai::set( \ return m_sai->set(entry, attr); \ } -DECLARE_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_SET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_SET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_SET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_SET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_SET_ENTRY); #define DECLARE_GET_ENTRY(OT,ot) \ sai_status_t ServerSai::get( \ @@ -268,14 +246,7 @@ sai_status_t ServerSai::get( \ return m_sai->get(entry, attr_count, attr_list); \ } -DECLARE_GET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_GET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_GET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_GET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_GET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_GET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_GET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_GET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_GET_ENTRY); // STATS @@ -426,11 +397,7 @@ sai_status_t ServerSai::bulkCreate( \ object_statuses); \ } -DECLARE_BULK_CREATE_ENTRY(ROUTE_ENTRY,route_entry) -DECLARE_BULK_CREATE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_CREATE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_CREATE_ENTRY(NAT_ENTRY,nat_entry) - +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_CREATE_ENTRY); // BULK REMOVE @@ -451,10 +418,7 @@ sai_status_t ServerSai::bulkRemove( \ object_statuses); \ } -DECLARE_BULK_REMOVE_ENTRY(ROUTE_ENTRY,route_entry) -DECLARE_BULK_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_REMOVE_ENTRY(NAT_ENTRY,nat_entry) +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_REMOVE_ENTRY); // BULK SET @@ -477,10 +441,7 @@ sai_status_t ServerSai::bulkSet( \ object_statuses); \ } -DECLARE_BULK_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_BULK_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_SET_ENTRY); // NON QUAD API diff --git a/lib/sai_redis.h b/lib/sai_redis.h index 1fea7b50941e..e137417f60e8 100644 --- a/lib/sai_redis.h +++ b/lib/sai_redis.h @@ -413,16 +413,3 @@ PRIVATE extern std::shared_ptr redis_sai; redis_bulk_remove_ ## ot, \ redis_bulk_set_ ## ot, \ redis_bulk_get_ ## ot, - -// DECLARE EVERY ENTRY - -#define REDIS_DECLARE_EVERY_ENTRY(_X) \ - _X(FDB_ENTRY,fdb_entry); \ - _X(INSEG_ENTRY,inseg_entry); \ - _X(IPMC_ENTRY,ipmc_entry); \ - _X(L2MC_ENTRY,l2mc_entry); \ - _X(MCAST_FDB_ENTRY,mcast_fdb_entry); \ - _X(NEIGHBOR_ENTRY,neighbor_entry); \ - _X(ROUTE_ENTRY,route_entry); \ - _X(NAT_ENTRY,nat_entry); \ - diff --git a/meta/DummySaiInterface.cpp b/meta/DummySaiInterface.cpp index 53b573e88586..245f725cd36b 100644 --- a/meta/DummySaiInterface.cpp +++ b/meta/DummySaiInterface.cpp @@ -116,20 +116,10 @@ sai_status_t DummySaiInterface::get( \ return m_status; \ } -#define DECLARE_ALL(X) \ - X(FDB_ENTRY,fdb_entry) \ - X(INSEG_ENTRY,inseg_entry); \ - X(IPMC_ENTRY,ipmc_entry); \ - X(L2MC_ENTRY,l2mc_entry); \ - X(MCAST_FDB_ENTRY,mcast_fdb_entry); \ - X(NEIGHBOR_ENTRY,neighbor_entry); \ - X(ROUTE_ENTRY,route_entry); \ - X(NAT_ENTRY,nat_entry); - -DECLARE_ALL(DECLARE_REMOVE_ENTRY); -DECLARE_ALL(DECLARE_CREATE_ENTRY); -DECLARE_ALL(DECLARE_SET_ENTRY); -DECLARE_ALL(DECLARE_GET_ENTRY); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_REMOVE_ENTRY); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_CREATE_ENTRY); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_SET_ENTRY); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_GET_ENTRY); sai_status_t DummySaiInterface::flushFdbEntries( _In_ sai_object_id_t switchId, diff --git a/syncd/VendorSai.cpp b/syncd/VendorSai.cpp index 39a9f1865879..637955d7a63a 100644 --- a/syncd/VendorSai.cpp +++ b/syncd/VendorSai.cpp @@ -290,15 +290,7 @@ sai_status_t VendorSai::create( \ return info->create(&mk, 0, attr_count, attr_list); \ } -DECLARE_CREATE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_CREATE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_CREATE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_CREATE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_CREATE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_CREATE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_CREATE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_CREATE_ENTRY(NAT_ENTRY,nat_entry); - +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_CREATE_ENTRY); #define DECLARE_REMOVE_ENTRY(OT,ot) \ sai_status_t VendorSai::remove( \ @@ -313,14 +305,7 @@ sai_status_t VendorSai::remove( \ return info->remove(&mk); \ } -DECLARE_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_REMOVE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_REMOVE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_REMOVE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_REMOVE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_REMOVE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_REMOVE_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_REMOVE_ENTRY); #define DECLARE_SET_ENTRY(OT,ot) \ sai_status_t VendorSai::set( \ @@ -336,14 +321,7 @@ sai_status_t VendorSai::set( \ return info->set(&mk, attr); \ } -DECLARE_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_SET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_SET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_SET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_SET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_SET_ENTRY); #define DECLARE_GET_ENTRY(OT,ot) \ sai_status_t VendorSai::get( \ @@ -360,14 +338,7 @@ sai_status_t VendorSai::get( \ return info->get(&mk, attr_count, attr_list); \ } -DECLARE_GET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_GET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_GET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_GET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_GET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_GET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_GET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_GET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_GET_ENTRY); // STATS diff --git a/unittest/vslib/TestSwitchBCM81724.cpp b/unittest/vslib/TestSwitchBCM81724.cpp index 068aa27b638d..4fc854ecaacb 100644 --- a/unittest/vslib/TestSwitchBCM81724.cpp +++ b/unittest/vslib/TestSwitchBCM81724.cpp @@ -101,8 +101,6 @@ TEST(SwitchBCM81724, refresh_read_only) auto strPortId = sai_serialize_object_id(portId); - printf("obj %s\n", strPortId.c_str()); - EXPECT_EQ(sw.create(SAI_OBJECT_TYPE_PORT, strPortId, switchId, 2, attrs), SAI_STATUS_SUCCESS); attr.id = SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS; diff --git a/vslib/Sai.cpp b/vslib/Sai.cpp index d905736a0313..c8c34547c44c 100644 --- a/vslib/Sai.cpp +++ b/vslib/Sai.cpp @@ -404,15 +404,7 @@ sai_status_t Sai::create( \ return m_meta->create(entry, attr_count, attr_list); \ } -DECLARE_CREATE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_CREATE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_CREATE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_CREATE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_CREATE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_CREATE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_CREATE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_CREATE_ENTRY(NAT_ENTRY,nat_entry); - +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_CREATE_ENTRY); #define DECLARE_REMOVE_ENTRY(OT,ot) \ sai_status_t Sai::remove( \ @@ -424,14 +416,7 @@ sai_status_t Sai::remove( \ return m_meta->remove(entry); \ } -DECLARE_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_REMOVE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_REMOVE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_REMOVE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_REMOVE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_REMOVE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_REMOVE_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_REMOVE_ENTRY); #define DECLARE_SET_ENTRY(OT,ot) \ sai_status_t Sai::set( \ @@ -444,14 +429,7 @@ sai_status_t Sai::set( \ return m_meta->set(entry, attr); \ } -DECLARE_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_SET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_SET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_SET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_SET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_SET_ENTRY); #define DECLARE_GET_ENTRY(OT,ot) \ sai_status_t Sai::get( \ @@ -465,14 +443,7 @@ sai_status_t Sai::get( \ return m_meta->get(entry, attr_count, attr_list); \ } -DECLARE_GET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_GET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_GET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_GET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_GET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_GET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_GET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_GET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_GET_ENTRY); // QUAD SERIALIZED @@ -704,11 +675,7 @@ sai_status_t Sai::bulkCreate( \ object_statuses); \ } -DECLARE_BULK_CREATE_ENTRY(ROUTE_ENTRY,route_entry) -DECLARE_BULK_CREATE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_CREATE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_CREATE_ENTRY(NAT_ENTRY,nat_entry) - +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_CREATE_ENTRY); // BULK REMOVE @@ -729,10 +696,7 @@ sai_status_t Sai::bulkRemove( \ object_statuses); \ } -DECLARE_BULK_REMOVE_ENTRY(ROUTE_ENTRY,route_entry) -DECLARE_BULK_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_REMOVE_ENTRY(NAT_ENTRY,nat_entry) +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_REMOVE_ENTRY); // BULK SET @@ -755,10 +719,7 @@ sai_status_t Sai::bulkSet( \ object_statuses); \ } -DECLARE_BULK_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_BULK_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_BULK_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_BULK_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_BULK_ENTRY(DECLARE_BULK_SET_ENTRY); // NON QUAD API diff --git a/vslib/VirtualSwitchSaiInterface.cpp b/vslib/VirtualSwitchSaiInterface.cpp index f5fb09430463..53c4b605cd92 100644 --- a/vslib/VirtualSwitchSaiInterface.cpp +++ b/vslib/VirtualSwitchSaiInterface.cpp @@ -415,14 +415,7 @@ sai_status_t VirtualSwitchSaiInterface::remove( \ sai_serialize_ ## ot(*entry)); \ } -DECLARE_REMOVE_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_REMOVE_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_REMOVE_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_REMOVE_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_REMOVE_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_REMOVE_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_REMOVE_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_REMOVE_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_REMOVE_ENTRY); #define DECLARE_CREATE_ENTRY(OT,ot) \ sai_status_t VirtualSwitchSaiInterface::create( \ @@ -486,14 +479,7 @@ sai_status_t VirtualSwitchSaiInterface::set( \ attr); \ } -DECLARE_SET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_SET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_SET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_SET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_SET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_SET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_SET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_SET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_SET_ENTRY); std::shared_ptr VirtualSwitchSaiInterface::init_switch( _In_ sai_object_id_t switch_id, @@ -755,14 +741,7 @@ sai_status_t VirtualSwitchSaiInterface::get( \ attr_list); \ } -DECLARE_GET_ENTRY(FDB_ENTRY,fdb_entry); -DECLARE_GET_ENTRY(INSEG_ENTRY,inseg_entry); -DECLARE_GET_ENTRY(IPMC_ENTRY,ipmc_entry); -DECLARE_GET_ENTRY(L2MC_ENTRY,l2mc_entry); -DECLARE_GET_ENTRY(MCAST_FDB_ENTRY,mcast_fdb_entry); -DECLARE_GET_ENTRY(NEIGHBOR_ENTRY,neighbor_entry); -DECLARE_GET_ENTRY(ROUTE_ENTRY,route_entry); -DECLARE_GET_ENTRY(NAT_ENTRY,nat_entry); +SAIREDIS_DECLARE_EVERY_ENTRY(DECLARE_GET_ENTRY); sai_status_t VirtualSwitchSaiInterface::objectTypeGetAvailability( _In_ sai_object_id_t switchId,