sonic-net
diff --git a/‎lib/src/Makefile.am
-7 b/‎lib/src/Makefile.am
-7
diff --git a/‎meta/Makefile.am
+7 b/‎meta/Makefile.am
+7
diff --git a/‎lib/src/Notification.cpp renamed to ‎meta/Notification.cpp b/‎lib/src/Notification.cpp renamed to ‎meta/Notification.cpp
diff --git a/‎lib/inc/Notification.h renamed to ‎meta/Notification.h
+1-1 b/‎lib/inc/Notification.h renamed to ‎meta/Notification.h
+1-1
diff --git a/‎lib/src/NotificationFactory.cpp renamed to ‎meta/NotificationFactory.cpp b/‎lib/src/NotificationFactory.cpp renamed to ‎meta/NotificationFactory.cpp
diff --git a/‎lib/inc/NotificationFactory.h renamed to ‎meta/NotificationFactory.h b/‎lib/inc/NotificationFactory.h renamed to ‎meta/NotificationFactory.h
diff --git a/‎lib/src/NotificationFdbEvent.cpp renamed to ‎meta/NotificationFdbEvent.cpp
+1-1 b/‎lib/src/NotificationFdbEvent.cpp renamed to ‎meta/NotificationFdbEvent.cpp
+1-1
diff --git a/‎lib/inc/NotificationFdbEvent.h renamed to ‎meta/NotificationFdbEvent.h b/‎lib/inc/NotificationFdbEvent.h renamed to ‎meta/NotificationFdbEvent.h
diff --git a/‎lib/src/NotificationPortStateChange.cpp renamed to ‎meta/NotificationPortStateChange.cpp
+1-1 b/‎lib/src/NotificationPortStateChange.cpp renamed to ‎meta/NotificationPortStateChange.cpp
+1-1
diff --git a/‎lib/inc/NotificationPortStateChange.h renamed to ‎meta/NotificationPortStateChange.h b/‎lib/inc/NotificationPortStateChange.h renamed to ‎meta/NotificationPortStateChange.h
diff --git a/‎lib/src/NotificationQueuePfcDeadlock.cpp renamed to ‎meta/NotificationQueuePfcDeadlock.cpp
+1-1 b/‎lib/src/NotificationQueuePfcDeadlock.cpp renamed to ‎meta/NotificationQueuePfcDeadlock.cpp
+1-1
diff --git a/‎lib/inc/NotificationQueuePfcDeadlock.h renamed to ‎meta/NotificationQueuePfcDeadlock.h b/‎lib/inc/NotificationQueuePfcDeadlock.h renamed to ‎meta/NotificationQueuePfcDeadlock.h
diff --git a/‎lib/src/NotificationSwitchShutdownRequest.cpp renamed to ‎meta/NotificationSwitchShutdownRequest.cpp
+1-2 b/‎lib/src/NotificationSwitchShutdownRequest.cpp renamed to ‎meta/NotificationSwitchShutdownRequest.cpp
+1-2
diff --git a/‎lib/inc/NotificationSwitchShutdownRequest.h renamed to ‎meta/NotificationSwitchShutdownRequest.h b/‎lib/inc/NotificationSwitchShutdownRequest.h renamed to ‎meta/NotificationSwitchShutdownRequest.h
diff --git a/‎lib/src/NotificationSwitchStateChange.cpp renamed to ‎meta/NotificationSwitchStateChange.cpp
+1-1 b/‎lib/src/NotificationSwitchStateChange.cpp renamed to ‎meta/NotificationSwitchStateChange.cpp
+1-1
diff --git a/‎lib/inc/NotificationSwitchStateChange.h renamed to ‎meta/NotificationSwitchStateChange.h b/‎lib/inc/NotificationSwitchStateChange.h renamed to ‎meta/NotificationSwitchStateChange.h
diff --git a/‎vslib/src/Makefile.am
+2-4 b/‎vslib/src/Makefile.am
+2-4
diff --git a/‎vslib/src/SwitchStateBaseFdb.cpp
+1-1 b/‎vslib/src/SwitchStateBaseFdb.cpp
+1-1
diff --git a/‎vslib/src/SwitchStateBaseHostif.cpp
+3-2 b/‎vslib/src/SwitchStateBaseHostif.cpp
+3-2
@@ -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 \
 
@@ -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 \
 
@@ -4,7 +4,7 @@ extern "C" {
 #include "saimetadata.h"
 }
 
-#include "meta/Meta.h"
+#include "Meta.h"
 
 #include <string>
 #include <memory>
 
@@ -2,7 +2,7 @@
 
 #include "swss/logger.h"
 
-#include "meta/sai_serialize.h"
+#include "sai_serialize.h"
 
 using namespace sairedis;
 
 
@@ -2,7 +2,7 @@
 
 #include "swss/logger.h"
 
-#include "meta/sai_serialize.h"
+#include "sai_serialize.h"
 
 using namespace sairedis;
 
 
@@ -2,7 +2,7 @@
 
 #include "swss/logger.h"
 
-#include "meta/sai_serialize.h"
+#include "sai_serialize.h"
 
 using namespace sairedis;
 
 
@@ -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);
     }
 }
-
@@ -2,7 +2,7 @@
 
 #include "swss/logger.h"
 
-#include "meta/sai_serialize.h"
+#include "sai_serialize.h"
 
 using namespace sairedis;
 
 
@@ -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 \
 
@@ -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>
 
@@ -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>
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ extern "C" {`
`4`	`4`	`#include "saimetadata.h"`
`5`	`5`	`}`
`6`	`6`
`7`		`-#include "meta/Meta.h"`
	`7`	`+#include "Meta.h"`
`8`	`8`
`9`	`9`	`#include <string>`
`10`	`10`	`#include <memory>`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#include "swss/logger.h"`
`4`	`4`
`5`		`-#include "meta/sai_serialize.h"`
	`5`	`+#include "sai_serialize.h"`
`6`	`6`
`7`	`7`	`using namespace sairedis;`
`8`	`8`
`@@ -49,4 +49,3 @@ void NotificationSwitchShutdownRequest::executeCallback(`
`49`	`49`	`switchNotifications.on_switch_shutdown_request(m_switchId);`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`-`