Move Notificatios to libsaimeta

sonic-net · Aug 21, 2021 · aaa519f · aaa519f
1 parent 855be73
commit aaa519f
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 21 deletions.
diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
@@ -27,13 +27,6 @@ libSaiRedis_a_SOURCES = \
 						 Switch.cpp \
 						 SwitchContainer.cpp \
 						 VirtualObjectIdManager.cpp \
-						 Notification.cpp \
-						 NotificationSwitchShutdownRequest.cpp \
-						 NotificationPortStateChange.cpp \
-						 NotificationSwitchStateChange.cpp \
-						 NotificationFdbEvent.cpp \
-						 NotificationQueuePfcDeadlock.cpp \
-						 NotificationFactory.cpp \
 						 RedisVidIndexGenerator.cpp \
 						 Recorder.cpp \
 						 RedisRemoteSaiInterface.cpp \

diff --git a/meta/Makefile.am b/meta/Makefile.am
@@ -30,6 +30,13 @@ libsaimetadata_la_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) -ansi $(CODE_COVERAGE_CFLAGS
 
 
 libsaimeta_la_SOURCES = \
+				Notification.cpp \
+				NotificationFactory.cpp \
+				NotificationFdbEvent.cpp \
+				NotificationPortStateChange.cpp \
+				NotificationQueuePfcDeadlock.cpp \
+				NotificationSwitchShutdownRequest.cpp \
+				NotificationSwitchStateChange.cpp \
 				SaiInterface.cpp \
 				SaiAttributeList.cpp \
 				saiserialize.cpp \

diff --git a/lib/src/Notification.cpp → meta/Notification.cpp b/lib/src/Notification.cpp → meta/Notification.cpp
diff --git a/lib/inc/Notification.h → meta/Notification.h b/lib/inc/Notification.h → meta/Notification.h
@@ -4,7 +4,7 @@ extern "C" {
 #include "saimetadata.h"
 }
 
-#include "meta/Meta.h"
+#include "Meta.h"
 
 #include <string>
 #include <memory>

diff --git a/lib/src/NotificationFactory.cpp → meta/NotificationFactory.cpp b/lib/src/NotificationFactory.cpp → meta/NotificationFactory.cpp
diff --git a/lib/inc/NotificationFactory.h → meta/NotificationFactory.h b/lib/inc/NotificationFactory.h → meta/NotificationFactory.h
diff --git a/lib/src/NotificationFdbEvent.cpp → meta/NotificationFdbEvent.cpp b/lib/src/NotificationFdbEvent.cpp → meta/NotificationFdbEvent.cpp
@@ -2,7 +2,7 @@
 
 #include "swss/logger.h"
 
-#include "meta/sai_serialize.h"
+#include "sai_serialize.h"
 
 using namespace sairedis;
 

diff --git a/lib/inc/NotificationFdbEvent.h → meta/NotificationFdbEvent.h b/lib/inc/NotificationFdbEvent.h → meta/NotificationFdbEvent.h
diff --git a/lib/src/NotificationPortStateChange.cpp → meta/NotificationPortStateChange.cpp b/lib/src/NotificationPortStateChange.cpp → meta/NotificationPortStateChange.cpp
@@ -2,7 +2,7 @@
 
 #include "swss/logger.h"
 
-#include "meta/sai_serialize.h"
+#include "sai_serialize.h"
 
 using namespace sairedis;
 

diff --git a/lib/inc/NotificationPortStateChange.h → meta/NotificationPortStateChange.h b/lib/inc/NotificationPortStateChange.h → meta/NotificationPortStateChange.h
diff --git a/lib/src/NotificationQueuePfcDeadlock.cpp → meta/NotificationQueuePfcDeadlock.cpp b/lib/src/NotificationQueuePfcDeadlock.cpp → meta/NotificationQueuePfcDeadlock.cpp
@@ -2,7 +2,7 @@
 
 #include "swss/logger.h"
 
-#include "meta/sai_serialize.h"
+#include "sai_serialize.h"
 
 using namespace sairedis;
 

diff --git a/lib/inc/NotificationQueuePfcDeadlock.h → meta/NotificationQueuePfcDeadlock.h b/lib/inc/NotificationQueuePfcDeadlock.h → meta/NotificationQueuePfcDeadlock.h
diff --git a/...src/NotificationSwitchShutdownRequest.cpp → meta/NotificationSwitchShutdownRequest.cpp b/...src/NotificationSwitchShutdownRequest.cpp → meta/NotificationSwitchShutdownRequest.cpp
@@ -2,7 +2,7 @@
 
 #include "swss/logger.h"
 
-#include "meta/sai_serialize.h"
+#include "sai_serialize.h"
 
 using namespace sairedis;
 
@@ -49,4 +49,3 @@ void NotificationSwitchShutdownRequest::executeCallback(
         switchNotifications.on_switch_shutdown_request(m_switchId);
     }
 }
-
diff --git a/lib/inc/NotificationSwitchShutdownRequest.h → meta/NotificationSwitchShutdownRequest.h b/lib/inc/NotificationSwitchShutdownRequest.h → meta/NotificationSwitchShutdownRequest.h
diff --git a/lib/src/NotificationSwitchStateChange.cpp → meta/NotificationSwitchStateChange.cpp b/lib/src/NotificationSwitchStateChange.cpp → meta/NotificationSwitchStateChange.cpp
@@ -2,7 +2,7 @@
 
 #include "swss/logger.h"
 
-#include "meta/sai_serialize.h"
+#include "sai_serialize.h"
 
 using namespace sairedis;
 

diff --git a/lib/inc/NotificationSwitchStateChange.h → meta/NotificationSwitchStateChange.h b/lib/inc/NotificationSwitchStateChange.h → meta/NotificationSwitchStateChange.h
diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I/usr/include/libnl3 -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/lib/inc
+AM_CXXFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I/usr/include/libnl3 -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental 
 
 if DEBUG
 DBGFLAGS = -ggdb -D_DEBUG_
@@ -9,10 +9,8 @@ endif
 lib_LTLIBRARIES = libsaivs.la
 
 noinst_LIBRARIES = libSaiVS.a
+
 libSaiVS_a_SOURCES = \
-					  ../../lib/src/NotificationFdbEvent.cpp \
-					  ../../lib/src/Notification.cpp \
-					  ../../lib/src/NotificationPortStateChange.cpp \
 					  Context.cpp \
 					  ContextConfig.cpp \
 					  ContextConfigContainer.cpp \

diff --git a/vslib/src/SwitchStateBaseFdb.cpp b/vslib/src/SwitchStateBaseFdb.cpp
@@ -5,7 +5,7 @@
 #include "swss/select.h"
 
 #include "meta/sai_serialize.h"
-#include "lib/inc/NotificationFdbEvent.h"
+#include "meta/NotificationFdbEvent.h"
 
 #include <linux/if_ether.h>
 #include <arpa/inet.h>

diff --git a/vslib/src/SwitchStateBaseHostif.cpp b/vslib/src/SwitchStateBaseHostif.cpp
@@ -2,9 +2,10 @@
 #include "HostInterfaceInfo.h"
 #include "EventPayloadNotification.h"
 
-#include "swss/logger.h"
 #include "meta/sai_serialize.h"
-#include "lib/inc/NotificationPortStateChange.h"
+#include "meta/NotificationPortStateChange.h"
+
+#include "swss/logger.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>