diff --git a/lib/inc/ClientSai.h b/lib/inc/ClientSai.h index 80dbe6ae5b93..31e36946fea8 100644 --- a/lib/inc/ClientSai.h +++ b/lib/inc/ClientSai.h @@ -13,51 +13,6 @@ #include #include -#define SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(ot) \ - virtual sai_status_t remove( \ - _In_ const sai_ ## ot ## _t* ot) override; - -#define SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(ot) \ - virtual sai_status_t create( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _In_ const sai_attribute_t *attr_list) override; - -#define SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(ot) \ - virtual sai_status_t set( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ const sai_attribute_t *attr) override; - -#define SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(ot) \ - virtual sai_status_t get( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _Out_ sai_attribute_t *attr_list) override; - -#define SAIREDIS_CLIENTSAI_DECLARE_BULK_CREATE_ENTRY(ot) \ - virtual sai_status_t bulkCreate( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _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) override; - -#define SAIREDIS_CLIENTSAI_DECLARE_BULK_REMOVE_ENTRY(ot) \ - virtual sai_status_t bulkRemove( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - -#define SAIREDIS_CLIENTSAI_DECLARE_BULK_SET_ENTRY(ot) \ - virtual sai_status_t bulkSet( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ const sai_attribute_t *attr_list, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - namespace sairedis { class ClientSai: @@ -101,49 +56,10 @@ namespace sairedis _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list) override; - public: // create ENTRY - - SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(fdb_entry); - SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(inseg_entry); - SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(ipmc_entry); - SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(l2mc_entry); - SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(mcast_fdb_entry); - SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(neighbor_entry); - SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(route_entry); - SAIREDIS_CLIENTSAI_DECLARE_CREATE_ENTRY(nat_entry); - - public: // remove ENTRY - - SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(fdb_entry); - SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(inseg_entry); - SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(ipmc_entry); - SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(l2mc_entry); - SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(mcast_fdb_entry); - SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(neighbor_entry); - SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(route_entry); - SAIREDIS_CLIENTSAI_DECLARE_REMOVE_ENTRY(nat_entry); - - public: // set ENTRY - - SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(fdb_entry); - SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(inseg_entry); - SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(ipmc_entry); - SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(l2mc_entry); - SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(mcast_fdb_entry); - SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(neighbor_entry); - SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(route_entry); - SAIREDIS_CLIENTSAI_DECLARE_SET_ENTRY(nat_entry); - - public: // get ENTRY - - SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(fdb_entry); - SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(inseg_entry); - SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(ipmc_entry); - SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(l2mc_entry); - SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(mcast_fdb_entry); - SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(neighbor_entry); - SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(route_entry); - SAIREDIS_CLIENTSAI_DECLARE_GET_ENTRY(nat_entry); + public: // QUAD ENTRY and BULK QUAD ENTRY + + SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE); + SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE); public: // bulk QUAD oid @@ -172,27 +88,6 @@ namespace sairedis _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) override; - public: // bulk create ENTRY - - SAIREDIS_CLIENTSAI_DECLARE_BULK_CREATE_ENTRY(fdb_entry); - SAIREDIS_CLIENTSAI_DECLARE_BULK_CREATE_ENTRY(inseg_entry); - SAIREDIS_CLIENTSAI_DECLARE_BULK_CREATE_ENTRY(nat_entry); - SAIREDIS_CLIENTSAI_DECLARE_BULK_CREATE_ENTRY(route_entry); - - public: // bulk remove ENTRY - - SAIREDIS_CLIENTSAI_DECLARE_BULK_REMOVE_ENTRY(fdb_entry); - SAIREDIS_CLIENTSAI_DECLARE_BULK_REMOVE_ENTRY(inseg_entry); - SAIREDIS_CLIENTSAI_DECLARE_BULK_REMOVE_ENTRY(nat_entry); - SAIREDIS_CLIENTSAI_DECLARE_BULK_REMOVE_ENTRY(route_entry); - - public: // bulk set ENTRY - - SAIREDIS_CLIENTSAI_DECLARE_BULK_SET_ENTRY(fdb_entry); - SAIREDIS_CLIENTSAI_DECLARE_BULK_SET_ENTRY(inseg_entry); - SAIREDIS_CLIENTSAI_DECLARE_BULK_SET_ENTRY(nat_entry); - SAIREDIS_CLIENTSAI_DECLARE_BULK_SET_ENTRY(route_entry); - public: // stats API virtual sai_status_t getStats( diff --git a/lib/inc/ClientServerSai.h b/lib/inc/ClientServerSai.h index 53d043bc3f2a..8f1386378106 100644 --- a/lib/inc/ClientServerSai.h +++ b/lib/inc/ClientServerSai.h @@ -5,51 +5,6 @@ #include #include -#define SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(ot) \ - virtual sai_status_t remove( \ - _In_ const sai_ ## ot ## _t* ot) override; - -#define SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(ot) \ - virtual sai_status_t create( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _In_ const sai_attribute_t *attr_list) override; - -#define SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(ot) \ - virtual sai_status_t set( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ const sai_attribute_t *attr) override; - -#define SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(ot) \ - virtual sai_status_t get( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _Out_ sai_attribute_t *attr_list) override; - -#define SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_CREATE_ENTRY(ot) \ - virtual sai_status_t bulkCreate( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _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) override; - -#define SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_REMOVE_ENTRY(ot) \ - virtual sai_status_t bulkRemove( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - -#define SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_SET_ENTRY(ot) \ - virtual sai_status_t bulkSet( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ const sai_attribute_t *attr_list, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - namespace sairedis { class ClientServerSai: @@ -93,49 +48,10 @@ namespace sairedis _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list) override; - public: // create ENTRY - - SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(fdb_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(inseg_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(ipmc_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(l2mc_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(mcast_fdb_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(neighbor_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(route_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_CREATE_ENTRY(nat_entry); - - public: // remove ENTRY - - SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(fdb_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(inseg_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(ipmc_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(l2mc_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(mcast_fdb_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(neighbor_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(route_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_REMOVE_ENTRY(nat_entry); - - public: // set ENTRY - - SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(fdb_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(inseg_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(ipmc_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(l2mc_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(mcast_fdb_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(neighbor_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(route_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_SET_ENTRY(nat_entry); - - public: // get ENTRY - - SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(fdb_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(inseg_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(ipmc_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(l2mc_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(mcast_fdb_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(neighbor_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(route_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_GET_ENTRY(nat_entry); + public: // QUAD ENTRY and BULK QUAD ENTRY + + SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE); + SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE); public: // bulk QUAD oid @@ -164,27 +80,6 @@ namespace sairedis _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) override; - public: // bulk create ENTRY - - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_CREATE_ENTRY(fdb_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_CREATE_ENTRY(inseg_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_CREATE_ENTRY(nat_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_CREATE_ENTRY(route_entry); - - public: // bulk remove ENTRY - - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_REMOVE_ENTRY(fdb_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_REMOVE_ENTRY(inseg_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_REMOVE_ENTRY(nat_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_REMOVE_ENTRY(route_entry); - - public: // bulk set ENTRY - - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_SET_ENTRY(fdb_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_SET_ENTRY(inseg_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_SET_ENTRY(nat_entry); - SAIREDIS_CLIENTSERVERSAI_DECLARE_BULK_SET_ENTRY(route_entry); - public: // stats API virtual sai_status_t getStats( diff --git a/lib/inc/RedisRemoteSaiInterface.h b/lib/inc/RedisRemoteSaiInterface.h index 6b963bf6c318..e4482ba1e886 100644 --- a/lib/inc/RedisRemoteSaiInterface.h +++ b/lib/inc/RedisRemoteSaiInterface.h @@ -21,51 +21,6 @@ #include #include -#define SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_REMOVE_ENTRY(ot) \ - virtual sai_status_t remove( \ - _In_ const sai_ ## ot ## _t* ot) override; - -#define SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_CREATE_ENTRY(ot) \ - virtual sai_status_t create( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _In_ const sai_attribute_t *attr_list) override; - -#define SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_SET_ENTRY(ot) \ - virtual sai_status_t set( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ const sai_attribute_t *attr) override; - -#define SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_GET_ENTRY(ot) \ - virtual sai_status_t get( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _Out_ sai_attribute_t *attr_list) override; - -#define SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(ot) \ - virtual sai_status_t bulkCreate( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _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) override; - -#define SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(ot) \ - virtual sai_status_t bulkRemove( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - -#define SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_SET_ENTRY(ot) \ - virtual sai_status_t bulkSet( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ const sai_attribute_t *attr_list, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - namespace sairedis { class RedisRemoteSaiInterface: @@ -112,49 +67,10 @@ namespace sairedis _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list) override; - public: // create ENTRY - - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_CREATE_ENTRY(fdb_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_CREATE_ENTRY(inseg_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_CREATE_ENTRY(ipmc_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_CREATE_ENTRY(l2mc_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_CREATE_ENTRY(mcast_fdb_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_CREATE_ENTRY(neighbor_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_CREATE_ENTRY(route_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_CREATE_ENTRY(nat_entry); - - public: // remove ENTRY - - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_REMOVE_ENTRY(fdb_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_REMOVE_ENTRY(inseg_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_REMOVE_ENTRY(ipmc_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_REMOVE_ENTRY(l2mc_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_REMOVE_ENTRY(mcast_fdb_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_REMOVE_ENTRY(neighbor_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_REMOVE_ENTRY(route_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_REMOVE_ENTRY(nat_entry); - - public: // set ENTRY - - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_SET_ENTRY(fdb_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_SET_ENTRY(inseg_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_SET_ENTRY(ipmc_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_SET_ENTRY(l2mc_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_SET_ENTRY(mcast_fdb_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_SET_ENTRY(neighbor_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_SET_ENTRY(route_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_SET_ENTRY(nat_entry); - - public: // get ENTRY - - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_GET_ENTRY(fdb_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_GET_ENTRY(inseg_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_GET_ENTRY(ipmc_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_GET_ENTRY(l2mc_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_GET_ENTRY(mcast_fdb_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_GET_ENTRY(neighbor_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_GET_ENTRY(route_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_GET_ENTRY(nat_entry); + public: // QUAD ENTRY and BULK QUAD ENTRY + + SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE); + SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE); public: // bulk QUAD oid @@ -183,27 +99,6 @@ namespace sairedis _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) override; - public: // bulk create ENTRY - - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(fdb_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(inseg_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(nat_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(route_entry); - - public: // bulk remove ENTRY - - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(fdb_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(inseg_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(nat_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(route_entry); - - public: // bulk set ENTRY - - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_SET_ENTRY(fdb_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_SET_ENTRY(inseg_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_SET_ENTRY(nat_entry); - SAIREDIS_REDISREMOTESAIINTERFACE_DECLARE_BULK_SET_ENTRY(route_entry); - public: // stats API virtual sai_status_t getStats( diff --git a/lib/inc/Sai.h b/lib/inc/Sai.h index 8a57c748cda4..00849f9055ed 100644 --- a/lib/inc/Sai.h +++ b/lib/inc/Sai.h @@ -14,51 +14,6 @@ #include #include -#define SAIREDIS_SAI_DECLARE_REMOVE_ENTRY(ot) \ - virtual sai_status_t remove( \ - _In_ const sai_ ## ot ## _t* ot) override; - -#define SAIREDIS_SAI_DECLARE_CREATE_ENTRY(ot) \ - virtual sai_status_t create( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _In_ const sai_attribute_t *attr_list) override; - -#define SAIREDIS_SAI_DECLARE_SET_ENTRY(ot) \ - virtual sai_status_t set( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ const sai_attribute_t *attr) override; - -#define SAIREDIS_SAI_DECLARE_GET_ENTRY(ot) \ - virtual sai_status_t get( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _Out_ sai_attribute_t *attr_list) override; - -#define SAIREDIS_SAI_DECLARE_BULK_CREATE_ENTRY(ot) \ - virtual sai_status_t bulkCreate( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _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) override; - -#define SAIREDIS_SAI_DECLARE_BULK_REMOVE_ENTRY(ot) \ - virtual sai_status_t bulkRemove( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - -#define SAIREDIS_SAI_DECLARE_BULK_SET_ENTRY(ot) \ - virtual sai_status_t bulkSet( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ const sai_attribute_t *attr_list, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - namespace sairedis { class Sai: @@ -102,49 +57,10 @@ namespace sairedis _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list) override; - public: // create ENTRY - - SAIREDIS_SAI_DECLARE_CREATE_ENTRY(fdb_entry); - SAIREDIS_SAI_DECLARE_CREATE_ENTRY(inseg_entry); - SAIREDIS_SAI_DECLARE_CREATE_ENTRY(ipmc_entry); - SAIREDIS_SAI_DECLARE_CREATE_ENTRY(l2mc_entry); - SAIREDIS_SAI_DECLARE_CREATE_ENTRY(mcast_fdb_entry); - SAIREDIS_SAI_DECLARE_CREATE_ENTRY(neighbor_entry); - SAIREDIS_SAI_DECLARE_CREATE_ENTRY(route_entry); - SAIREDIS_SAI_DECLARE_CREATE_ENTRY(nat_entry); - - public: // remove ENTRY - - SAIREDIS_SAI_DECLARE_REMOVE_ENTRY(fdb_entry); - SAIREDIS_SAI_DECLARE_REMOVE_ENTRY(inseg_entry); - SAIREDIS_SAI_DECLARE_REMOVE_ENTRY(ipmc_entry); - SAIREDIS_SAI_DECLARE_REMOVE_ENTRY(l2mc_entry); - SAIREDIS_SAI_DECLARE_REMOVE_ENTRY(mcast_fdb_entry); - SAIREDIS_SAI_DECLARE_REMOVE_ENTRY(neighbor_entry); - SAIREDIS_SAI_DECLARE_REMOVE_ENTRY(route_entry); - SAIREDIS_SAI_DECLARE_REMOVE_ENTRY(nat_entry); - - public: // set ENTRY - - SAIREDIS_SAI_DECLARE_SET_ENTRY(fdb_entry); - SAIREDIS_SAI_DECLARE_SET_ENTRY(inseg_entry); - SAIREDIS_SAI_DECLARE_SET_ENTRY(ipmc_entry); - SAIREDIS_SAI_DECLARE_SET_ENTRY(l2mc_entry); - SAIREDIS_SAI_DECLARE_SET_ENTRY(mcast_fdb_entry); - SAIREDIS_SAI_DECLARE_SET_ENTRY(neighbor_entry); - SAIREDIS_SAI_DECLARE_SET_ENTRY(route_entry); - SAIREDIS_SAI_DECLARE_SET_ENTRY(nat_entry); - - public: // get ENTRY - - SAIREDIS_SAI_DECLARE_GET_ENTRY(fdb_entry); - SAIREDIS_SAI_DECLARE_GET_ENTRY(inseg_entry); - SAIREDIS_SAI_DECLARE_GET_ENTRY(ipmc_entry); - SAIREDIS_SAI_DECLARE_GET_ENTRY(l2mc_entry); - SAIREDIS_SAI_DECLARE_GET_ENTRY(mcast_fdb_entry); - SAIREDIS_SAI_DECLARE_GET_ENTRY(neighbor_entry); - SAIREDIS_SAI_DECLARE_GET_ENTRY(route_entry); - SAIREDIS_SAI_DECLARE_GET_ENTRY(nat_entry); + public: // QUAD ENTRY and BULK QUAD ENTRY + + SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE); + SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE); public: // bulk QUAD oid @@ -173,27 +89,6 @@ namespace sairedis _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) override; - public: // bulk create ENTRY - - SAIREDIS_SAI_DECLARE_BULK_CREATE_ENTRY(fdb_entry); - SAIREDIS_SAI_DECLARE_BULK_CREATE_ENTRY(inseg_entry); - SAIREDIS_SAI_DECLARE_BULK_CREATE_ENTRY(nat_entry); - SAIREDIS_SAI_DECLARE_BULK_CREATE_ENTRY(route_entry); - - public: // bulk remove ENTRY - - SAIREDIS_SAI_DECLARE_BULK_REMOVE_ENTRY(fdb_entry); - SAIREDIS_SAI_DECLARE_BULK_REMOVE_ENTRY(inseg_entry); - SAIREDIS_SAI_DECLARE_BULK_REMOVE_ENTRY(nat_entry); - SAIREDIS_SAI_DECLARE_BULK_REMOVE_ENTRY(route_entry); - - public: // bulk set ENTRY - - SAIREDIS_SAI_DECLARE_BULK_SET_ENTRY(fdb_entry); - SAIREDIS_SAI_DECLARE_BULK_SET_ENTRY(inseg_entry); - SAIREDIS_SAI_DECLARE_BULK_SET_ENTRY(nat_entry); - SAIREDIS_SAI_DECLARE_BULK_SET_ENTRY(route_entry); - public: // stats API virtual sai_status_t getStats( diff --git a/lib/inc/ServerSai.h b/lib/inc/ServerSai.h index f26d35113bf6..1626871932db 100644 --- a/lib/inc/ServerSai.h +++ b/lib/inc/ServerSai.h @@ -10,51 +10,6 @@ #include #include -#define SAIREDIS_SERVERSAI_DECLARE_REMOVE_ENTRY(ot) \ - virtual sai_status_t remove( \ - _In_ const sai_ ## ot ## _t* ot) override; - -#define SAIREDIS_SERVERSAI_DECLARE_CREATE_ENTRY(ot) \ - virtual sai_status_t create( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _In_ const sai_attribute_t *attr_list) override; - -#define SAIREDIS_SERVERSAI_DECLARE_SET_ENTRY(ot) \ - virtual sai_status_t set( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ const sai_attribute_t *attr) override; - -#define SAIREDIS_SERVERSAI_DECLARE_GET_ENTRY(ot) \ - virtual sai_status_t get( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _Out_ sai_attribute_t *attr_list) override; - -#define SAIREDIS_SERVERSAI_DECLARE_BULK_CREATE_ENTRY(ot) \ - virtual sai_status_t bulkCreate( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _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) override; - -#define SAIREDIS_SERVERSAI_DECLARE_BULK_REMOVE_ENTRY(ot) \ - virtual sai_status_t bulkRemove( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - -#define SAIREDIS_SERVERSAI_DECLARE_BULK_SET_ENTRY(ot) \ - virtual sai_status_t bulkSet( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ const sai_attribute_t *attr_list, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - namespace sairedis { class ServerSai: @@ -98,49 +53,10 @@ namespace sairedis _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list) override; - public: // create ENTRY - - SAIREDIS_SERVERSAI_DECLARE_CREATE_ENTRY(fdb_entry); - SAIREDIS_SERVERSAI_DECLARE_CREATE_ENTRY(inseg_entry); - SAIREDIS_SERVERSAI_DECLARE_CREATE_ENTRY(ipmc_entry); - SAIREDIS_SERVERSAI_DECLARE_CREATE_ENTRY(l2mc_entry); - SAIREDIS_SERVERSAI_DECLARE_CREATE_ENTRY(mcast_fdb_entry); - SAIREDIS_SERVERSAI_DECLARE_CREATE_ENTRY(neighbor_entry); - SAIREDIS_SERVERSAI_DECLARE_CREATE_ENTRY(route_entry); - SAIREDIS_SERVERSAI_DECLARE_CREATE_ENTRY(nat_entry); - - public: // remove ENTRY - - SAIREDIS_SERVERSAI_DECLARE_REMOVE_ENTRY(fdb_entry); - SAIREDIS_SERVERSAI_DECLARE_REMOVE_ENTRY(inseg_entry); - SAIREDIS_SERVERSAI_DECLARE_REMOVE_ENTRY(ipmc_entry); - SAIREDIS_SERVERSAI_DECLARE_REMOVE_ENTRY(l2mc_entry); - SAIREDIS_SERVERSAI_DECLARE_REMOVE_ENTRY(mcast_fdb_entry); - SAIREDIS_SERVERSAI_DECLARE_REMOVE_ENTRY(neighbor_entry); - SAIREDIS_SERVERSAI_DECLARE_REMOVE_ENTRY(route_entry); - SAIREDIS_SERVERSAI_DECLARE_REMOVE_ENTRY(nat_entry); - - public: // set ENTRY - - SAIREDIS_SERVERSAI_DECLARE_SET_ENTRY(fdb_entry); - SAIREDIS_SERVERSAI_DECLARE_SET_ENTRY(inseg_entry); - SAIREDIS_SERVERSAI_DECLARE_SET_ENTRY(ipmc_entry); - SAIREDIS_SERVERSAI_DECLARE_SET_ENTRY(l2mc_entry); - SAIREDIS_SERVERSAI_DECLARE_SET_ENTRY(mcast_fdb_entry); - SAIREDIS_SERVERSAI_DECLARE_SET_ENTRY(neighbor_entry); - SAIREDIS_SERVERSAI_DECLARE_SET_ENTRY(route_entry); - SAIREDIS_SERVERSAI_DECLARE_SET_ENTRY(nat_entry); - - public: // get ENTRY - - SAIREDIS_SERVERSAI_DECLARE_GET_ENTRY(fdb_entry); - SAIREDIS_SERVERSAI_DECLARE_GET_ENTRY(inseg_entry); - SAIREDIS_SERVERSAI_DECLARE_GET_ENTRY(ipmc_entry); - SAIREDIS_SERVERSAI_DECLARE_GET_ENTRY(l2mc_entry); - SAIREDIS_SERVERSAI_DECLARE_GET_ENTRY(mcast_fdb_entry); - SAIREDIS_SERVERSAI_DECLARE_GET_ENTRY(neighbor_entry); - SAIREDIS_SERVERSAI_DECLARE_GET_ENTRY(route_entry); - SAIREDIS_SERVERSAI_DECLARE_GET_ENTRY(nat_entry); + public: // QUAD ENTRY and BULK QUAD ENTRY + + SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE); + SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE); public: // bulk QUAD oid @@ -169,27 +85,6 @@ namespace sairedis _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) override; - public: // bulk create ENTRY - - SAIREDIS_SERVERSAI_DECLARE_BULK_CREATE_ENTRY(fdb_entry); - SAIREDIS_SERVERSAI_DECLARE_BULK_CREATE_ENTRY(inseg_entry); - SAIREDIS_SERVERSAI_DECLARE_BULK_CREATE_ENTRY(nat_entry); - SAIREDIS_SERVERSAI_DECLARE_BULK_CREATE_ENTRY(route_entry); - - public: // bulk remove ENTRY - - SAIREDIS_SERVERSAI_DECLARE_BULK_REMOVE_ENTRY(fdb_entry); - SAIREDIS_SERVERSAI_DECLARE_BULK_REMOVE_ENTRY(inseg_entry); - SAIREDIS_SERVERSAI_DECLARE_BULK_REMOVE_ENTRY(nat_entry); - SAIREDIS_SERVERSAI_DECLARE_BULK_REMOVE_ENTRY(route_entry); - - public: // bulk set ENTRY - - SAIREDIS_SERVERSAI_DECLARE_BULK_SET_ENTRY(fdb_entry); - SAIREDIS_SERVERSAI_DECLARE_BULK_SET_ENTRY(inseg_entry); - SAIREDIS_SERVERSAI_DECLARE_BULK_SET_ENTRY(nat_entry); - SAIREDIS_SERVERSAI_DECLARE_BULK_SET_ENTRY(route_entry); - public: // stats API virtual sai_status_t getStats( diff --git a/meta/DummySaiInterface.h b/meta/DummySaiInterface.h index 26547fde33eb..14bb89dab226 100644 --- a/meta/DummySaiInterface.h +++ b/meta/DummySaiInterface.h @@ -4,51 +4,6 @@ #include -#define SAIMETA_DUMMYSAIINTERFACE_DECLARE_REMOVE_ENTRY(ot) \ - virtual sai_status_t remove( \ - _In_ const sai_ ## ot ## _t* ot) override; - -#define SAIMETA_DUMMYSAIINTERFACE_DECLARE_CREATE_ENTRY(ot) \ - virtual sai_status_t create( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _In_ const sai_attribute_t *attr_list) override; - -#define SAIMETA_DUMMYSAIINTERFACE_DECLARE_SET_ENTRY(ot) \ - virtual sai_status_t set( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ const sai_attribute_t *attr) override; - -#define SAIMETA_DUMMYSAIINTERFACE_DECLARE_GET_ENTRY(ot) \ - virtual sai_status_t get( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _Out_ sai_attribute_t *attr_list) override; - -#define SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(ot) \ - virtual sai_status_t bulkCreate( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _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) override; - -#define SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(ot) \ - virtual sai_status_t bulkRemove( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - -#define SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_SET_ENTRY(ot) \ - virtual sai_status_t bulkSet( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ const sai_attribute_t *attr_list, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - namespace saimeta { /** @@ -102,49 +57,10 @@ namespace saimeta _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list) override; - public: // create ENTRY - - SAIMETA_DUMMYSAIINTERFACE_DECLARE_CREATE_ENTRY(fdb_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_CREATE_ENTRY(inseg_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_CREATE_ENTRY(ipmc_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_CREATE_ENTRY(l2mc_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_CREATE_ENTRY(mcast_fdb_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_CREATE_ENTRY(neighbor_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_CREATE_ENTRY(route_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_CREATE_ENTRY(nat_entry); - - public: // remove ENTRY - - SAIMETA_DUMMYSAIINTERFACE_DECLARE_REMOVE_ENTRY(fdb_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_REMOVE_ENTRY(inseg_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_REMOVE_ENTRY(ipmc_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_REMOVE_ENTRY(l2mc_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_REMOVE_ENTRY(mcast_fdb_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_REMOVE_ENTRY(neighbor_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_REMOVE_ENTRY(route_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_REMOVE_ENTRY(nat_entry); - - public: // set ENTRY - - SAIMETA_DUMMYSAIINTERFACE_DECLARE_SET_ENTRY(fdb_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_SET_ENTRY(inseg_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_SET_ENTRY(ipmc_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_SET_ENTRY(l2mc_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_SET_ENTRY(mcast_fdb_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_SET_ENTRY(neighbor_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_SET_ENTRY(route_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_SET_ENTRY(nat_entry); - - public: // get ENTRY - - SAIMETA_DUMMYSAIINTERFACE_DECLARE_GET_ENTRY(fdb_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_GET_ENTRY(inseg_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_GET_ENTRY(ipmc_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_GET_ENTRY(l2mc_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_GET_ENTRY(mcast_fdb_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_GET_ENTRY(neighbor_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_GET_ENTRY(route_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_GET_ENTRY(nat_entry); + public: // QUAD ENTRY and BULK QUAD ENTRY + + SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE); + SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE); public: // bulk QUAD oid @@ -173,27 +89,6 @@ namespace saimeta _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) override; - public: // bulk create ENTRY - - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(fdb_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(inseg_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(nat_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(route_entry); - - public: // bulk remove ENTRY - - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(fdb_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(inseg_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(nat_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(route_entry); - - public: // bulk set ENTRY - - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_SET_ENTRY(fdb_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_SET_ENTRY(inseg_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_SET_ENTRY(nat_entry); - SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_SET_ENTRY(route_entry); - public: // stats API virtual sai_status_t getStats( diff --git a/meta/Meta.h b/meta/Meta.h index 84a7f98f1d21..84aed371b226 100644 --- a/meta/Meta.h +++ b/meta/Meta.h @@ -14,51 +14,6 @@ #include #include -#define SAIREDIS_META_DECLARE_REMOVE_ENTRY(ot) \ - virtual sai_status_t remove( \ - _In_ const sai_ ## ot ## _t* ot) override; - -#define SAIREDIS_META_DECLARE_CREATE_ENTRY(ot) \ - virtual sai_status_t create( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _In_ const sai_attribute_t *attr_list) override; - -#define SAIREDIS_META_DECLARE_SET_ENTRY(ot) \ - virtual sai_status_t set( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ const sai_attribute_t *attr) override; - -#define SAIREDIS_META_DECLARE_GET_ENTRY(ot) \ - virtual sai_status_t get( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _Out_ sai_attribute_t *attr_list) override; - -#define SAIREDIS_META_DECLARE_BULK_CREATE_ENTRY(ot) \ - virtual sai_status_t bulkCreate( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _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) override; - -#define SAIREDIS_META_DECLARE_BULK_REMOVE_ENTRY(ot) \ - virtual sai_status_t bulkRemove( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - -#define SAIREDIS_META_DECLARE_BULK_SET_ENTRY(ot) \ - virtual sai_status_t bulkSet( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ const sai_attribute_t *attr_list, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - #define DEFAULT_VLAN_NUMBER 1 #define MINIMUM_VLAN_NUMBER 1 #define MAXIMUM_VLAN_NUMBER 4094 @@ -109,49 +64,10 @@ namespace saimeta _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list) override; - public: // create ENTRY - - SAIREDIS_META_DECLARE_CREATE_ENTRY(fdb_entry); - SAIREDIS_META_DECLARE_CREATE_ENTRY(inseg_entry); - SAIREDIS_META_DECLARE_CREATE_ENTRY(ipmc_entry); - SAIREDIS_META_DECLARE_CREATE_ENTRY(l2mc_entry); - SAIREDIS_META_DECLARE_CREATE_ENTRY(mcast_fdb_entry); - SAIREDIS_META_DECLARE_CREATE_ENTRY(neighbor_entry); - SAIREDIS_META_DECLARE_CREATE_ENTRY(route_entry); - SAIREDIS_META_DECLARE_CREATE_ENTRY(nat_entry); - - public: // remove ENTRY - - SAIREDIS_META_DECLARE_REMOVE_ENTRY(fdb_entry); - SAIREDIS_META_DECLARE_REMOVE_ENTRY(inseg_entry); - SAIREDIS_META_DECLARE_REMOVE_ENTRY(ipmc_entry); - SAIREDIS_META_DECLARE_REMOVE_ENTRY(l2mc_entry); - SAIREDIS_META_DECLARE_REMOVE_ENTRY(mcast_fdb_entry); - SAIREDIS_META_DECLARE_REMOVE_ENTRY(neighbor_entry); - SAIREDIS_META_DECLARE_REMOVE_ENTRY(route_entry); - SAIREDIS_META_DECLARE_REMOVE_ENTRY(nat_entry); - - public: // set ENTRY - - SAIREDIS_META_DECLARE_SET_ENTRY(fdb_entry); - SAIREDIS_META_DECLARE_SET_ENTRY(inseg_entry); - SAIREDIS_META_DECLARE_SET_ENTRY(ipmc_entry); - SAIREDIS_META_DECLARE_SET_ENTRY(l2mc_entry); - SAIREDIS_META_DECLARE_SET_ENTRY(mcast_fdb_entry); - SAIREDIS_META_DECLARE_SET_ENTRY(neighbor_entry); - SAIREDIS_META_DECLARE_SET_ENTRY(route_entry); - SAIREDIS_META_DECLARE_SET_ENTRY(nat_entry); - - public: // get ENTRY - - SAIREDIS_META_DECLARE_GET_ENTRY(fdb_entry); - SAIREDIS_META_DECLARE_GET_ENTRY(inseg_entry); - SAIREDIS_META_DECLARE_GET_ENTRY(ipmc_entry); - SAIREDIS_META_DECLARE_GET_ENTRY(l2mc_entry); - SAIREDIS_META_DECLARE_GET_ENTRY(mcast_fdb_entry); - SAIREDIS_META_DECLARE_GET_ENTRY(neighbor_entry); - SAIREDIS_META_DECLARE_GET_ENTRY(route_entry); - SAIREDIS_META_DECLARE_GET_ENTRY(nat_entry); + public: // QUAD ENTRY and BULK QUAD ENTRY + + SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE); + SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE); public: // bulk QUAD oid @@ -180,27 +96,6 @@ namespace saimeta _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) override; - public: // bulk create ENTRY - - SAIREDIS_META_DECLARE_BULK_CREATE_ENTRY(fdb_entry); - SAIREDIS_META_DECLARE_BULK_CREATE_ENTRY(inseg_entry); - SAIREDIS_META_DECLARE_BULK_CREATE_ENTRY(nat_entry); - SAIREDIS_META_DECLARE_BULK_CREATE_ENTRY(route_entry); - - public: // bulk remove ENTRY - - SAIREDIS_META_DECLARE_BULK_REMOVE_ENTRY(fdb_entry); - SAIREDIS_META_DECLARE_BULK_REMOVE_ENTRY(inseg_entry); - SAIREDIS_META_DECLARE_BULK_REMOVE_ENTRY(nat_entry); - SAIREDIS_META_DECLARE_BULK_REMOVE_ENTRY(route_entry); - - public: // bulk set ENTRY - - SAIREDIS_META_DECLARE_BULK_SET_ENTRY(fdb_entry); - SAIREDIS_META_DECLARE_BULK_SET_ENTRY(inseg_entry); - SAIREDIS_META_DECLARE_BULK_SET_ENTRY(nat_entry); - SAIREDIS_META_DECLARE_BULK_SET_ENTRY(route_entry); - public: // stats API virtual sai_status_t getStats( diff --git a/meta/SaiInterface.h b/meta/SaiInterface.h index 92c9400b4622..c1e794133f5f 100644 --- a/meta/SaiInterface.h +++ b/meta/SaiInterface.h @@ -5,52 +5,91 @@ extern "C" { #include "saimetadata.h" } -//#include "sairedis.h" - -#define SAIREDIS_SAIINTERFACE_DECLARE_REMOVE_ENTRY(ot) \ - virtual sai_status_t remove( \ - _In_ const sai_ ## ot ## _t* ot) = 0; - -#define SAIREDIS_SAIINTERFACE_DECLARE_CREATE_ENTRY(ot) \ - virtual sai_status_t create( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _In_ const sai_attribute_t *attr_list) = 0; - -#define SAIREDIS_SAIINTERFACE_DECLARE_SET_ENTRY(ot) \ - virtual sai_status_t set( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ const sai_attribute_t *attr) = 0; - -#define SAIREDIS_SAIINTERFACE_DECLARE_GET_ENTRY(ot) \ - virtual sai_status_t get( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _Out_ sai_attribute_t *attr_list) = 0; \ - -#define SAIREDIS_SAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(ot) \ - virtual sai_status_t bulkCreate( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _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) = 0; - -#define SAIREDIS_SAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(ot) \ - virtual sai_status_t bulkRemove( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) = 0; - -#define SAIREDIS_SAIINTERFACE_DECLARE_BULK_SET_ENTRY(ot) \ - virtual sai_status_t bulkSet( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ const sai_attribute_t *attr_list, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) = 0; +#define SAIREDIS_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); \ + +#define SAIREDIS_DECLARE_EVERY_BULK_ENTRY(_X) \ + _X(FDB_ENTRY,fdb_entry); \ + _X(INSEG_ENTRY,inseg_entry); \ + _X(NAT_ENTRY,nat_entry); \ + _X(ROUTE_ENTRY,route_entry); \ + +#define SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_VIRTUAL(OT,ot) \ + virtual sai_status_t create( \ + _In_ const sai_ ## ot ## _t* ot, \ + _In_ uint32_t attr_count, \ + _In_ const sai_attribute_t *attr_list) = 0; \ + virtual sai_status_t remove( \ + _In_ const sai_ ## ot ## _t* ot) = 0; \ + virtual sai_status_t set( \ + _In_ const sai_ ## ot ## _t* ot, \ + _In_ const sai_attribute_t *attr) = 0; \ + virtual sai_status_t get( \ + _In_ const sai_ ## ot ## _t* ot, \ + _In_ uint32_t attr_count, \ + _Out_ sai_attribute_t *attr_list) = 0; \ + +#define SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE(OT,ot) \ + virtual sai_status_t create( \ + _In_ const sai_ ## ot ## _t* ot, \ + _In_ uint32_t attr_count, \ + _In_ const sai_attribute_t *attr_list) override; \ + virtual sai_status_t remove( \ + _In_ const sai_ ## ot ## _t* ot) override; \ + virtual sai_status_t set( \ + _In_ const sai_ ## ot ## _t* ot, \ + _In_ const sai_attribute_t *attr) override; \ + virtual sai_status_t get( \ + _In_ const sai_ ## ot ## _t* ot, \ + _In_ uint32_t attr_count, \ + _Out_ sai_attribute_t *attr_list) override; \ + +#define SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_VIRTUAL(OT,ot) \ + virtual sai_status_t bulkCreate( \ + _In_ uint32_t object_count, \ + _In_ const sai_ ## ot ## _t *ot, \ + _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) = 0; \ + virtual sai_status_t bulkRemove( \ + _In_ uint32_t object_count, \ + _In_ const sai_ ## ot ## _t *ot, \ + _In_ sai_bulk_op_error_mode_t mode, \ + _Out_ sai_status_t *object_statuses) = 0; \ + virtual sai_status_t bulkSet( \ + _In_ uint32_t object_count, \ + _In_ const sai_ ## ot ## _t *ot, \ + _In_ const sai_attribute_t *attr_list, \ + _In_ sai_bulk_op_error_mode_t mode, \ + _Out_ sai_status_t *object_statuses) = 0; \ + +#define SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE(OT,ot) \ + virtual sai_status_t bulkCreate( \ + _In_ uint32_t object_count, \ + _In_ const sai_ ## ot ## _t *ot, \ + _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) override; \ + virtual sai_status_t bulkRemove( \ + _In_ uint32_t object_count, \ + _In_ const sai_ ## ot ## _t *ot, \ + _In_ sai_bulk_op_error_mode_t mode, \ + _Out_ sai_status_t *object_statuses) override; \ + virtual sai_status_t bulkSet( \ + _In_ uint32_t object_count, \ + _In_ const sai_ ## ot ## _t *ot, \ + _In_ const sai_attribute_t *attr_list, \ + _In_ sai_bulk_op_error_mode_t mode, \ + _Out_ sai_status_t *object_statuses) override; \ namespace sairedis { @@ -94,49 +133,10 @@ namespace sairedis _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list) = 0; - public: // create ENTRY - - SAIREDIS_SAIINTERFACE_DECLARE_CREATE_ENTRY(fdb_entry); - SAIREDIS_SAIINTERFACE_DECLARE_CREATE_ENTRY(inseg_entry); - SAIREDIS_SAIINTERFACE_DECLARE_CREATE_ENTRY(ipmc_entry); - SAIREDIS_SAIINTERFACE_DECLARE_CREATE_ENTRY(l2mc_entry); - SAIREDIS_SAIINTERFACE_DECLARE_CREATE_ENTRY(mcast_fdb_entry); - SAIREDIS_SAIINTERFACE_DECLARE_CREATE_ENTRY(neighbor_entry); - SAIREDIS_SAIINTERFACE_DECLARE_CREATE_ENTRY(route_entry); - SAIREDIS_SAIINTERFACE_DECLARE_CREATE_ENTRY(nat_entry); - - public: // remove ENTRY - - SAIREDIS_SAIINTERFACE_DECLARE_REMOVE_ENTRY(fdb_entry); - SAIREDIS_SAIINTERFACE_DECLARE_REMOVE_ENTRY(inseg_entry); - SAIREDIS_SAIINTERFACE_DECLARE_REMOVE_ENTRY(ipmc_entry); - SAIREDIS_SAIINTERFACE_DECLARE_REMOVE_ENTRY(l2mc_entry); - SAIREDIS_SAIINTERFACE_DECLARE_REMOVE_ENTRY(mcast_fdb_entry); - SAIREDIS_SAIINTERFACE_DECLARE_REMOVE_ENTRY(neighbor_entry); - SAIREDIS_SAIINTERFACE_DECLARE_REMOVE_ENTRY(route_entry); - SAIREDIS_SAIINTERFACE_DECLARE_REMOVE_ENTRY(nat_entry); - - public: // set ENTRY - - SAIREDIS_SAIINTERFACE_DECLARE_SET_ENTRY(fdb_entry); - SAIREDIS_SAIINTERFACE_DECLARE_SET_ENTRY(inseg_entry); - SAIREDIS_SAIINTERFACE_DECLARE_SET_ENTRY(ipmc_entry); - SAIREDIS_SAIINTERFACE_DECLARE_SET_ENTRY(l2mc_entry); - SAIREDIS_SAIINTERFACE_DECLARE_SET_ENTRY(mcast_fdb_entry); - SAIREDIS_SAIINTERFACE_DECLARE_SET_ENTRY(neighbor_entry); - SAIREDIS_SAIINTERFACE_DECLARE_SET_ENTRY(route_entry); - SAIREDIS_SAIINTERFACE_DECLARE_SET_ENTRY(nat_entry); - - public: // get ENTRY - - SAIREDIS_SAIINTERFACE_DECLARE_GET_ENTRY(fdb_entry); - SAIREDIS_SAIINTERFACE_DECLARE_GET_ENTRY(inseg_entry); - SAIREDIS_SAIINTERFACE_DECLARE_GET_ENTRY(ipmc_entry); - SAIREDIS_SAIINTERFACE_DECLARE_GET_ENTRY(l2mc_entry); - SAIREDIS_SAIINTERFACE_DECLARE_GET_ENTRY(mcast_fdb_entry); - SAIREDIS_SAIINTERFACE_DECLARE_GET_ENTRY(neighbor_entry); - SAIREDIS_SAIINTERFACE_DECLARE_GET_ENTRY(route_entry); - SAIREDIS_SAIINTERFACE_DECLARE_GET_ENTRY(nat_entry); + public: // QUAD ENTRY and BULK QUAD ENTRY + + SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_VIRTUAL); + SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_VIRTUAL); public: // bulk QUAD oid @@ -165,27 +165,6 @@ namespace sairedis _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) = 0; - public: // bulk create ENTRY - - SAIREDIS_SAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(fdb_entry); - SAIREDIS_SAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(inseg_entry); - SAIREDIS_SAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(nat_entry); - SAIREDIS_SAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(route_entry); - - public: // bulk remove ENTRY - - SAIREDIS_SAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(fdb_entry); - SAIREDIS_SAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(inseg_entry); - SAIREDIS_SAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(nat_entry); - SAIREDIS_SAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(route_entry); - - public: // bulk set ENTRY - - SAIREDIS_SAIINTERFACE_DECLARE_BULK_SET_ENTRY(fdb_entry); - SAIREDIS_SAIINTERFACE_DECLARE_BULK_SET_ENTRY(inseg_entry); - SAIREDIS_SAIINTERFACE_DECLARE_BULK_SET_ENTRY(nat_entry); - SAIREDIS_SAIINTERFACE_DECLARE_BULK_SET_ENTRY(route_entry); - public: // QUAD meta key virtual sai_status_t create( diff --git a/syncd/VendorSai.h b/syncd/VendorSai.h index 0e3bae3ea98e..cc6f7746ed52 100644 --- a/syncd/VendorSai.h +++ b/syncd/VendorSai.h @@ -11,51 +11,6 @@ extern "C" { #include #include -#define SYNCD_VENDORSAI_DECLARE_REMOVE_ENTRY(ot) \ - virtual sai_status_t remove( \ - _In_ const sai_ ## ot ## _t* ot) override; - -#define SYNCD_VENDORSAI_DECLARE_CREATE_ENTRY(ot) \ - virtual sai_status_t create( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _In_ const sai_attribute_t *attr_list) override; - -#define SYNCD_VENDORSAI_DECLARE_SET_ENTRY(ot) \ - virtual sai_status_t set( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ const sai_attribute_t *attr) override; - -#define SYNCD_VENDORSAI_DECLARE_GET_ENTRY(ot) \ - virtual sai_status_t get( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _Out_ sai_attribute_t *attr_list) override; - -#define SYNCD_VENDORSAI_DECLARE_BULK_CREATE_ENTRY(ot) \ - virtual sai_status_t bulkCreate( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _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) override; - -#define SYNCD_VENDORSAI_DECLARE_BULK_REMOVE_ENTRY(ot) \ - virtual sai_status_t bulkRemove( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - -#define SYNCD_VENDORSAI_DECLARE_BULK_SET_ENTRY(ot) \ - virtual sai_status_t bulkSet( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ const sai_attribute_t *attr_list, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - namespace syncd { class VendorSai: @@ -99,49 +54,10 @@ namespace syncd _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list) override; - public: // create ENTRY - - SYNCD_VENDORSAI_DECLARE_CREATE_ENTRY(fdb_entry); - SYNCD_VENDORSAI_DECLARE_CREATE_ENTRY(inseg_entry); - SYNCD_VENDORSAI_DECLARE_CREATE_ENTRY(ipmc_entry); - SYNCD_VENDORSAI_DECLARE_CREATE_ENTRY(l2mc_entry); - SYNCD_VENDORSAI_DECLARE_CREATE_ENTRY(mcast_fdb_entry); - SYNCD_VENDORSAI_DECLARE_CREATE_ENTRY(neighbor_entry); - SYNCD_VENDORSAI_DECLARE_CREATE_ENTRY(route_entry); - SYNCD_VENDORSAI_DECLARE_CREATE_ENTRY(nat_entry); - - public: // remove ENTRY - - SYNCD_VENDORSAI_DECLARE_REMOVE_ENTRY(fdb_entry); - SYNCD_VENDORSAI_DECLARE_REMOVE_ENTRY(inseg_entry); - SYNCD_VENDORSAI_DECLARE_REMOVE_ENTRY(ipmc_entry); - SYNCD_VENDORSAI_DECLARE_REMOVE_ENTRY(l2mc_entry); - SYNCD_VENDORSAI_DECLARE_REMOVE_ENTRY(mcast_fdb_entry); - SYNCD_VENDORSAI_DECLARE_REMOVE_ENTRY(neighbor_entry); - SYNCD_VENDORSAI_DECLARE_REMOVE_ENTRY(route_entry); - SYNCD_VENDORSAI_DECLARE_REMOVE_ENTRY(nat_entry); - - public: // set ENTRY - - SYNCD_VENDORSAI_DECLARE_SET_ENTRY(fdb_entry); - SYNCD_VENDORSAI_DECLARE_SET_ENTRY(inseg_entry); - SYNCD_VENDORSAI_DECLARE_SET_ENTRY(ipmc_entry); - SYNCD_VENDORSAI_DECLARE_SET_ENTRY(l2mc_entry); - SYNCD_VENDORSAI_DECLARE_SET_ENTRY(mcast_fdb_entry); - SYNCD_VENDORSAI_DECLARE_SET_ENTRY(neighbor_entry); - SYNCD_VENDORSAI_DECLARE_SET_ENTRY(route_entry); - SYNCD_VENDORSAI_DECLARE_SET_ENTRY(nat_entry); - - public: // get ENTRY - - SYNCD_VENDORSAI_DECLARE_GET_ENTRY(fdb_entry); - SYNCD_VENDORSAI_DECLARE_GET_ENTRY(inseg_entry); - SYNCD_VENDORSAI_DECLARE_GET_ENTRY(ipmc_entry); - SYNCD_VENDORSAI_DECLARE_GET_ENTRY(l2mc_entry); - SYNCD_VENDORSAI_DECLARE_GET_ENTRY(mcast_fdb_entry); - SYNCD_VENDORSAI_DECLARE_GET_ENTRY(neighbor_entry); - SYNCD_VENDORSAI_DECLARE_GET_ENTRY(route_entry); - SYNCD_VENDORSAI_DECLARE_GET_ENTRY(nat_entry); + public: // QUAD ENTRY and BULK QUAD ENTRY + + SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE); + SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE); public: // bulk QUAD oid @@ -170,27 +86,6 @@ namespace syncd _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) override; - public: // bulk create ENTRY - - SYNCD_VENDORSAI_DECLARE_BULK_CREATE_ENTRY(fdb_entry); - SYNCD_VENDORSAI_DECLARE_BULK_CREATE_ENTRY(inseg_entry); - SYNCD_VENDORSAI_DECLARE_BULK_CREATE_ENTRY(nat_entry); - SYNCD_VENDORSAI_DECLARE_BULK_CREATE_ENTRY(route_entry); - - public: // bulk remove ENTRY - - SYNCD_VENDORSAI_DECLARE_BULK_REMOVE_ENTRY(fdb_entry); - SYNCD_VENDORSAI_DECLARE_BULK_REMOVE_ENTRY(inseg_entry); - SYNCD_VENDORSAI_DECLARE_BULK_REMOVE_ENTRY(nat_entry); - SYNCD_VENDORSAI_DECLARE_BULK_REMOVE_ENTRY(route_entry); - - public: // bulk set ENTRY - - SYNCD_VENDORSAI_DECLARE_BULK_SET_ENTRY(fdb_entry); - SYNCD_VENDORSAI_DECLARE_BULK_SET_ENTRY(inseg_entry); - SYNCD_VENDORSAI_DECLARE_BULK_SET_ENTRY(nat_entry); - SYNCD_VENDORSAI_DECLARE_BULK_SET_ENTRY(route_entry); - public: // stats API virtual sai_status_t getStats( diff --git a/vslib/inc/Sai.h b/vslib/inc/Sai.h index 6560fe4a304c..9c0133ce3299 100644 --- a/vslib/inc/Sai.h +++ b/vslib/inc/Sai.h @@ -19,51 +19,6 @@ #include #include -#define SAIVS_SAI_DECLARE_REMOVE_ENTRY(ot) \ - virtual sai_status_t remove( \ - _In_ const sai_ ## ot ## _t* ot) override; - -#define SAIVS_SAI_DECLARE_CREATE_ENTRY(ot) \ - virtual sai_status_t create( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _In_ const sai_attribute_t *attr_list) override; - -#define SAIVS_SAI_DECLARE_SET_ENTRY(ot) \ - virtual sai_status_t set( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ const sai_attribute_t *attr) override; - -#define SAIVS_SAI_DECLARE_GET_ENTRY(ot) \ - virtual sai_status_t get( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _Out_ sai_attribute_t *attr_list) override; - -#define SAIVS_SAI_DECLARE_BULK_CREATE_ENTRY(ot) \ - virtual sai_status_t bulkCreate( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _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) override; - -#define SAIVS_SAI_DECLARE_BULK_REMOVE_ENTRY(ot) \ - virtual sai_status_t bulkRemove( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - -#define SAIVS_SAI_DECLARE_BULK_SET_ENTRY(ot) \ - virtual sai_status_t bulkSet( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ const sai_attribute_t *attr_list, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - namespace saivs { class Sai: @@ -107,49 +62,10 @@ namespace saivs _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list) override; - public: // create ENTRY - - SAIVS_SAI_DECLARE_CREATE_ENTRY(fdb_entry); - SAIVS_SAI_DECLARE_CREATE_ENTRY(inseg_entry); - SAIVS_SAI_DECLARE_CREATE_ENTRY(ipmc_entry); - SAIVS_SAI_DECLARE_CREATE_ENTRY(l2mc_entry); - SAIVS_SAI_DECLARE_CREATE_ENTRY(mcast_fdb_entry); - SAIVS_SAI_DECLARE_CREATE_ENTRY(neighbor_entry); - SAIVS_SAI_DECLARE_CREATE_ENTRY(route_entry); - SAIVS_SAI_DECLARE_CREATE_ENTRY(nat_entry); - - public: // remove ENTRY - - SAIVS_SAI_DECLARE_REMOVE_ENTRY(fdb_entry); - SAIVS_SAI_DECLARE_REMOVE_ENTRY(inseg_entry); - SAIVS_SAI_DECLARE_REMOVE_ENTRY(ipmc_entry); - SAIVS_SAI_DECLARE_REMOVE_ENTRY(l2mc_entry); - SAIVS_SAI_DECLARE_REMOVE_ENTRY(mcast_fdb_entry); - SAIVS_SAI_DECLARE_REMOVE_ENTRY(neighbor_entry); - SAIVS_SAI_DECLARE_REMOVE_ENTRY(route_entry); - SAIVS_SAI_DECLARE_REMOVE_ENTRY(nat_entry); - - public: // set ENTRY - - SAIVS_SAI_DECLARE_SET_ENTRY(fdb_entry); - SAIVS_SAI_DECLARE_SET_ENTRY(inseg_entry); - SAIVS_SAI_DECLARE_SET_ENTRY(ipmc_entry); - SAIVS_SAI_DECLARE_SET_ENTRY(l2mc_entry); - SAIVS_SAI_DECLARE_SET_ENTRY(mcast_fdb_entry); - SAIVS_SAI_DECLARE_SET_ENTRY(neighbor_entry); - SAIVS_SAI_DECLARE_SET_ENTRY(route_entry); - SAIVS_SAI_DECLARE_SET_ENTRY(nat_entry); - - public: // get ENTRY - - SAIVS_SAI_DECLARE_GET_ENTRY(fdb_entry); - SAIVS_SAI_DECLARE_GET_ENTRY(inseg_entry); - SAIVS_SAI_DECLARE_GET_ENTRY(ipmc_entry); - SAIVS_SAI_DECLARE_GET_ENTRY(l2mc_entry); - SAIVS_SAI_DECLARE_GET_ENTRY(mcast_fdb_entry); - SAIVS_SAI_DECLARE_GET_ENTRY(neighbor_entry); - SAIVS_SAI_DECLARE_GET_ENTRY(route_entry); - SAIVS_SAI_DECLARE_GET_ENTRY(nat_entry); + public: // QUAD ENTRY and BULK QUAD ENTRY + + SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE); + SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE); public: // bulk QUAD oid @@ -178,27 +94,6 @@ namespace saivs _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) override; - public: // bulk create ENTRY - - SAIVS_SAI_DECLARE_BULK_CREATE_ENTRY(fdb_entry); - SAIVS_SAI_DECLARE_BULK_CREATE_ENTRY(inseg_entry); - SAIVS_SAI_DECLARE_BULK_CREATE_ENTRY(nat_entry); - SAIVS_SAI_DECLARE_BULK_CREATE_ENTRY(route_entry); - - public: // bulk remove ENTRY - - SAIVS_SAI_DECLARE_BULK_REMOVE_ENTRY(fdb_entry); - SAIVS_SAI_DECLARE_BULK_REMOVE_ENTRY(inseg_entry); - SAIVS_SAI_DECLARE_BULK_REMOVE_ENTRY(nat_entry); - SAIVS_SAI_DECLARE_BULK_REMOVE_ENTRY(route_entry); - - public: // bulk set ENTRY - - SAIVS_SAI_DECLARE_BULK_SET_ENTRY(fdb_entry); - SAIVS_SAI_DECLARE_BULK_SET_ENTRY(inseg_entry); - SAIVS_SAI_DECLARE_BULK_SET_ENTRY(nat_entry); - SAIVS_SAI_DECLARE_BULK_SET_ENTRY(route_entry); - public: // stats API virtual sai_status_t getStats( diff --git a/vslib/inc/VirtualSwitchSaiInterface.h b/vslib/inc/VirtualSwitchSaiInterface.h index 40fb9dcb584a..518def4d2ef1 100644 --- a/vslib/inc/VirtualSwitchSaiInterface.h +++ b/vslib/inc/VirtualSwitchSaiInterface.h @@ -17,51 +17,6 @@ #include #include -#define SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_REMOVE_ENTRY(ot) \ - virtual sai_status_t remove( \ - _In_ const sai_ ## ot ## _t* ot) override; - -#define SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_CREATE_ENTRY(ot) \ - virtual sai_status_t create( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _In_ const sai_attribute_t *attr_list) override; - -#define SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_SET_ENTRY(ot) \ - virtual sai_status_t set( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ const sai_attribute_t *attr) override; - -#define SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_GET_ENTRY(ot) \ - virtual sai_status_t get( \ - _In_ const sai_ ## ot ## _t* ot, \ - _In_ uint32_t attr_count, \ - _Out_ sai_attribute_t *attr_list) override; - -#define SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(ot) \ - virtual sai_status_t bulkCreate( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _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) override; - -#define SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(ot) \ - virtual sai_status_t bulkRemove( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - -#define SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_SET_ENTRY(ot) \ - virtual sai_status_t bulkSet( \ - _In_ uint32_t object_count, \ - _In_ const sai_ ## ot ## _t *ot, \ - _In_ const sai_attribute_t *attr_list, \ - _In_ sai_bulk_op_error_mode_t mode, \ - _Out_ sai_status_t *object_statuses) override; - namespace saivs { class VirtualSwitchSaiInterface: @@ -106,49 +61,10 @@ namespace saivs _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list) override; - public: // create ENTRY - - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_CREATE_ENTRY(fdb_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_CREATE_ENTRY(inseg_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_CREATE_ENTRY(ipmc_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_CREATE_ENTRY(l2mc_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_CREATE_ENTRY(mcast_fdb_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_CREATE_ENTRY(neighbor_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_CREATE_ENTRY(route_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_CREATE_ENTRY(nat_entry); - - public: // remove ENTRY - - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_REMOVE_ENTRY(fdb_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_REMOVE_ENTRY(inseg_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_REMOVE_ENTRY(ipmc_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_REMOVE_ENTRY(l2mc_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_REMOVE_ENTRY(mcast_fdb_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_REMOVE_ENTRY(neighbor_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_REMOVE_ENTRY(route_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_REMOVE_ENTRY(nat_entry); - - public: // set ENTRY - - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_SET_ENTRY(fdb_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_SET_ENTRY(inseg_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_SET_ENTRY(ipmc_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_SET_ENTRY(l2mc_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_SET_ENTRY(mcast_fdb_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_SET_ENTRY(neighbor_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_SET_ENTRY(route_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_SET_ENTRY(nat_entry); - - public: // get ENTRY - - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_GET_ENTRY(fdb_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_GET_ENTRY(inseg_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_GET_ENTRY(ipmc_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_GET_ENTRY(l2mc_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_GET_ENTRY(mcast_fdb_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_GET_ENTRY(neighbor_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_GET_ENTRY(route_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_GET_ENTRY(nat_entry); + public: // QUAD ENTRY and BULK QUAD ENTRY + + SAIREDIS_DECLARE_EVERY_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_QUAD_ENTRY_OVERRIDE); + SAIREDIS_DECLARE_EVERY_BULK_ENTRY(SAIREDIS_SAIINTERFACE_DECLARE_BULK_ENTRY_OVERRIDE); public: // bulk QUAD oid @@ -177,27 +93,6 @@ namespace saivs _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) override; - public: // bulk create ENTRY - - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(fdb_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(inseg_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(nat_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(route_entry); - - public: // bulk remove ENTRY - - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(fdb_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(inseg_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(nat_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(route_entry); - - public: // bulk set ENTRY - - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_SET_ENTRY(fdb_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_SET_ENTRY(inseg_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_SET_ENTRY(nat_entry); - SAIVS_VIRTUALSWITCHSAIINTERFACE_DECLARE_BULK_SET_ENTRY(route_entry); - public: // stats API virtual sai_status_t getStats(