Move SaiInterface to meta directory

sonic-net · Aug 21, 2021 · 737393d · 737393d
1 parent e13991a
commit 737393d
Show file tree

Hide file tree

Showing 24 changed files with 28 additions and 34 deletions.
diff --git 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
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SaiInterface.h"
+#include "meta/SaiInterface.h"
 
 #include <memory>
 #include <mutex>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,31 +1,31 @@
 #pragma once
 
-#include "lib/inc/SaiInterface.h"
+#include "SaiInterface.h"
 
 #include <memory>
 
-#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
@@ -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
@@ -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
@@ -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
@@ -37,6 +37,5 @@ namespace saimeta
         private:
 
             std::shared_ptr<sairedis::VirtualObjectIdManager> m_virtualObjectIdManager;
-
     };
 }
diff --git a/lib/src/SaiInterface.cpp → meta/SaiInterface.cpp b/lib/src/SaiInterface.cpp → meta/SaiInterface.cpp
diff --git a/lib/inc/SaiInterface.h → meta/SaiInterface.h b/lib/inc/SaiInterface.h → 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
@@ -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 <memory>
 #include <map>

diff --git 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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "lib/inc/SaiInterface.h"
+#include "meta/SaiInterface.h"
 
 #include <memory>
 #include <set>

diff --git 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
@@ -5,8 +5,7 @@
 #include "RedisClient.h"
 #include "NotificationHandler.h"
 
-#include "lib/inc/SaiInterface.h"
-
+#include "meta/SaiInterface.h"
 #include "meta/SaiAttributeList.h"
 
 #include <string>

diff --git 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 <string>
 #include <vector>

diff --git 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 <mutex>
 #include <unordered_map>

diff --git 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
@@ -5,7 +5,7 @@ extern "C" {
 #include "saiextensions.h"
 }
 
-#include "SaiInterface.h"
+#include "meta/SaiInterface.h"
 
 #include "swss/logger.h"