From 737393d7fbe42a66733aa3d98663c62ab2d68a97 Mon Sep 17 00:00:00 2001 From: kcudnik Date: Tue, 10 Aug 2021 16:22:53 +0200 Subject: [PATCH] Move SaiInterface to meta directory --- lib/inc/ClientSai.h | 2 +- lib/inc/ClientServerSai.h | 2 +- lib/inc/RemoteSaiInterface.h | 2 +- lib/inc/ServerSai.h | 2 +- lib/inc/sai_redis.h | 2 +- lib/src/Makefile.am | 1 - meta/DummySaiInterface.h | 16 ++++++++-------- meta/Makefile.am | 2 +- meta/Meta.h | 2 +- meta/MetaTestSaiInterface.cpp | 1 - meta/MetaTestSaiInterface.h | 1 - {lib/src => meta}/SaiInterface.cpp | 0 {lib/inc => meta}/SaiInterface.h | 1 - saiplayer/SaiPlayer.h | 8 ++++---- syncd/FlexCounter.cpp | 1 - syncd/FlexCounter.h | 2 +- syncd/HardReiniter.h | 2 +- syncd/SaiDiscovery.h | 2 +- syncd/SaiSwitch.h | 2 +- syncd/SingleReiniter.h | 3 +-- syncd/VendorSai.h | 2 +- syncd/VirtualOidTranslator.h | 2 +- vslib/inc/VirtualSwitchSaiInterface.h | 2 +- vslib/inc/sai_vs.h | 2 +- 24 files changed, 28 insertions(+), 34 deletions(-) rename {lib/src => meta}/SaiInterface.cpp (100%) rename {lib/inc => meta}/SaiInterface.h (99%) diff --git a/lib/inc/ClientSai.h b/lib/inc/ClientSai.h index 5628093b2b98..6689d26ded4f 100644 --- a/lib/inc/ClientSai.h +++ b/lib/inc/ClientSai.h @@ -1,6 +1,6 @@ #pragma once -#include "SaiInterface.h" +#include "meta/SaiInterface.h" #include "Channel.h" #include "SwitchContainer.h" #include "Notification.h" diff --git a/lib/inc/ClientServerSai.h b/lib/inc/ClientServerSai.h index 99a00a175dbe..53d043bc3f2a 100644 --- a/lib/inc/ClientServerSai.h +++ b/lib/inc/ClientServerSai.h @@ -1,6 +1,6 @@ #pragma once -#include "SaiInterface.h" +#include "meta/SaiInterface.h" #include #include diff --git a/lib/inc/RemoteSaiInterface.h b/lib/inc/RemoteSaiInterface.h index 8775b8283881..8d5c4156c6aa 100644 --- a/lib/inc/RemoteSaiInterface.h +++ b/lib/inc/RemoteSaiInterface.h @@ -1,6 +1,6 @@ #pragma once -#include "SaiInterface.h" +#include "meta/SaiInterface.h" namespace sairedis { diff --git a/lib/inc/ServerSai.h b/lib/inc/ServerSai.h index f9bd96648739..a2d83ff5fcf3 100644 --- a/lib/inc/ServerSai.h +++ b/lib/inc/ServerSai.h @@ -1,6 +1,6 @@ #pragma once -#include "SaiInterface.h" +#include "meta/SaiInterface.h" #include "meta/SaiAttributeList.h" #include "syncd/SelectableChannel.h" diff --git a/lib/inc/sai_redis.h b/lib/inc/sai_redis.h index e7bc91b457fc..1fea7b50941e 100644 --- a/lib/inc/sai_redis.h +++ b/lib/inc/sai_redis.h @@ -5,7 +5,7 @@ extern "C" { #include "saiextensions.h" } -#include "SaiInterface.h" +#include "meta/SaiInterface.h" #include "swss/logger.h" diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am index 50933513bb25..19344dc77e81 100644 --- a/lib/src/Makefile.am +++ b/lib/src/Makefile.am @@ -23,7 +23,6 @@ libSaiRedis_a_SOURCES = \ Context.cpp \ ContextConfigContainer.cpp \ ContextConfig.cpp \ - SaiInterface.cpp \ SwitchConfig.cpp \ SwitchConfigContainer.cpp \ RedisChannel.cpp \ diff --git a/meta/DummySaiInterface.h b/meta/DummySaiInterface.h index d248da1bd457..26547fde33eb 100644 --- a/meta/DummySaiInterface.h +++ b/meta/DummySaiInterface.h @@ -1,31 +1,31 @@ #pragma once -#include "lib/inc/SaiInterface.h" +#include "SaiInterface.h" #include -#define SAIMETA_DUMMYSAIINTERFACE_DECLARE_REMOVE_ENTRY(ot) \ +#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) \ +#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) \ +#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) \ +#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) \ +#define SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_CREATE_ENTRY(ot) \ virtual sai_status_t bulkCreate( \ _In_ uint32_t object_count, \ _In_ const sai_ ## ot ## _t *ot, \ @@ -34,14 +34,14 @@ _In_ sai_bulk_op_error_mode_t mode, \ _Out_ sai_status_t *object_statuses) override; -#define SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_REMOVE_ENTRY(ot) \ +#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) \ +#define SAIMETA_DUMMYSAIINTERFACE_DECLARE_BULK_SET_ENTRY(ot) \ virtual sai_status_t bulkSet( \ _In_ uint32_t object_count, \ _In_ const sai_ ## ot ## _t *ot, \ diff --git a/meta/Makefile.am b/meta/Makefile.am index 375883efa93c..f597c085ed77 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -30,7 +30,7 @@ libsaimetadata_la_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) -ansi $(CODE_COVERAGE_CFLAGS libsaimeta_la_SOURCES = \ - ../lib/src/SaiInterface.cpp \ + SaiInterface.cpp \ SaiAttributeList.cpp \ saiserialize.cpp \ SaiAttrWrapper.cpp \ diff --git a/meta/Meta.h b/meta/Meta.h index 629bfab8849a..84a7f98f1d21 100644 --- a/meta/Meta.h +++ b/meta/Meta.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/inc/SaiInterface.h" +#include "SaiInterface.h" #include "SaiAttrWrapper.h" #include "SaiObjectCollection.h" diff --git a/meta/MetaTestSaiInterface.cpp b/meta/MetaTestSaiInterface.cpp index 701d9500adae..bcd3d7363eab 100644 --- a/meta/MetaTestSaiInterface.cpp +++ b/meta/MetaTestSaiInterface.cpp @@ -126,4 +126,3 @@ sai_object_id_t MetaTestSaiInterface::switchIdQuery( return m_virtualObjectIdManager->saiSwitchIdQuery(objectId); } - diff --git a/meta/MetaTestSaiInterface.h b/meta/MetaTestSaiInterface.h index ed3b34359774..f0709c7066e3 100644 --- a/meta/MetaTestSaiInterface.h +++ b/meta/MetaTestSaiInterface.h @@ -37,6 +37,5 @@ namespace saimeta private: std::shared_ptr m_virtualObjectIdManager; - }; } diff --git a/lib/src/SaiInterface.cpp b/meta/SaiInterface.cpp similarity index 100% rename from lib/src/SaiInterface.cpp rename to meta/SaiInterface.cpp diff --git a/lib/inc/SaiInterface.h b/meta/SaiInterface.h similarity index 99% rename from lib/inc/SaiInterface.h rename to meta/SaiInterface.h index 69ceb61b6808..5f312205ca0a 100644 --- a/lib/inc/SaiInterface.h +++ b/meta/SaiInterface.h @@ -266,6 +266,5 @@ namespace sairedis virtual sai_status_t logSet( _In_ sai_api_t api, _In_ sai_log_level_t log_level) = 0; - }; } diff --git a/saiplayer/SaiPlayer.h b/saiplayer/SaiPlayer.h index 74f01a0ab563..f9f0c1287fbd 100644 --- a/saiplayer/SaiPlayer.h +++ b/saiplayer/SaiPlayer.h @@ -2,10 +2,10 @@ #include "CommandLineOptions.h" -#include "../lib/inc/SaiInterface.h" -#include "../meta/SaiAttributeList.h" -#include "../syncd/ServiceMethodTable.h" -#include "../syncd/SwitchNotifications.h" +#include "meta/SaiInterface.h" +#include "meta/SaiAttributeList.h" +#include "syncd/ServiceMethodTable.h" +#include "syncd/SwitchNotifications.h" #include #include diff --git a/syncd/FlexCounter.cpp b/syncd/FlexCounter.cpp index 1f49d3e633e7..45c2ef009182 100644 --- a/syncd/FlexCounter.cpp +++ b/syncd/FlexCounter.cpp @@ -2,7 +2,6 @@ #include "VidManager.h" #include "meta/sai_serialize.h" -#include "lib/inc/SaiInterface.h" #include "swss/redisapi.h" #include "swss/tokenize.h" diff --git a/syncd/FlexCounter.h b/syncd/FlexCounter.h index 9123e5cee9e6..4a30cf6c95ee 100644 --- a/syncd/FlexCounter.h +++ b/syncd/FlexCounter.h @@ -4,7 +4,7 @@ extern "C" { #include "sai.h" } -#include "SaiInterface.h" +#include "meta/SaiInterface.h" #include "swss/table.h" diff --git a/syncd/HardReiniter.h b/syncd/HardReiniter.h index b9871870440b..9a032d16e928 100644 --- a/syncd/HardReiniter.h +++ b/syncd/HardReiniter.h @@ -1,6 +1,6 @@ #pragma once -#include "SaiInterface.h" +#include "meta/SaiInterface.h" #include "SaiSwitch.h" #include "VirtualOidTranslator.h" #include "RedisClient.h" diff --git a/syncd/SaiDiscovery.h b/syncd/SaiDiscovery.h index 1ce50fe747cd..a5d02f1de152 100644 --- a/syncd/SaiDiscovery.h +++ b/syncd/SaiDiscovery.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/inc/SaiInterface.h" +#include "meta/SaiInterface.h" #include #include diff --git a/syncd/SaiSwitch.h b/syncd/SaiSwitch.h index da13b5851812..ee372e8acba8 100644 --- a/syncd/SaiSwitch.h +++ b/syncd/SaiSwitch.h @@ -4,7 +4,7 @@ extern "C" { #include "sai.h" } -#include "SaiInterface.h" +#include "meta/SaiInterface.h" #include "VirtualOidTranslator.h" #include "RedisClient.h" #include "SaiSwitchInterface.h" diff --git a/syncd/SingleReiniter.h b/syncd/SingleReiniter.h index 3da2351e2009..e33b26af8032 100644 --- a/syncd/SingleReiniter.h +++ b/syncd/SingleReiniter.h @@ -5,8 +5,7 @@ #include "RedisClient.h" #include "NotificationHandler.h" -#include "lib/inc/SaiInterface.h" - +#include "meta/SaiInterface.h" #include "meta/SaiAttributeList.h" #include diff --git a/syncd/VendorSai.h b/syncd/VendorSai.h index 73459080b2e3..0e3bae3ea98e 100644 --- a/syncd/VendorSai.h +++ b/syncd/VendorSai.h @@ -4,7 +4,7 @@ extern "C" { #include "sai.h" } -#include "lib/inc/SaiInterface.h" +#include "meta/SaiInterface.h" #include #include diff --git a/syncd/VirtualOidTranslator.h b/syncd/VirtualOidTranslator.h index a46d9e4790c7..6334ba24ee87 100644 --- a/syncd/VirtualOidTranslator.h +++ b/syncd/VirtualOidTranslator.h @@ -7,7 +7,7 @@ extern "C"{ #include "VirtualObjectIdManager.h" #include "RedisClient.h" -#include "SaiInterface.h" +#include "meta/SaiInterface.h" #include #include diff --git a/vslib/inc/VirtualSwitchSaiInterface.h b/vslib/inc/VirtualSwitchSaiInterface.h index 12c8abeefe57..9477372a4ab0 100644 --- a/vslib/inc/VirtualSwitchSaiInterface.h +++ b/vslib/inc/VirtualSwitchSaiInterface.h @@ -9,7 +9,7 @@ #include "EventPayloadNetLinkMsg.h" #include "ContextConfig.h" -#include "lib/inc/SaiInterface.h" +#include "meta/SaiInterface.h" #include "meta/Meta.h" diff --git a/vslib/inc/sai_vs.h b/vslib/inc/sai_vs.h index 442da0e06f93..b445ce7546c4 100644 --- a/vslib/inc/sai_vs.h +++ b/vslib/inc/sai_vs.h @@ -5,7 +5,7 @@ extern "C" { #include "saiextensions.h" } -#include "SaiInterface.h" +#include "meta/SaiInterface.h" #include "swss/logger.h"