Propagate Notifications changes

sonic-net · Aug 21, 2021 · 5b71d21 · 5b71d21
1 parent aaa519f
commit 5b71d21
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/lib/inc/ClientSai.h b/lib/inc/ClientSai.h
@@ -3,7 +3,8 @@
 #include "meta/SaiInterface.h"
 #include "Channel.h"
 #include "SwitchContainer.h"
-#include "Notification.h"
+
+#include "meta/Notification.h"
 
 #include "swss/table.h"
 

diff --git a/lib/inc/Context.h b/lib/inc/Context.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "RedisRemoteSaiInterface.h"
-#include "Notification.h"
 #include "ContextConfig.h"
 
+#include "meta/Notification.h"
 #include "meta/Meta.h"
 
 namespace sairedis

diff --git a/lib/inc/RedisChannel.h b/lib/inc/RedisChannel.h
@@ -4,10 +4,11 @@
 #include "RemoteSaiInterface.h"
 #include "SwitchContainer.h"
 #include "VirtualObjectIdManager.h"
-#include "Notification.h"
 #include "Recorder.h"
 #include "SkipRecordAttrContainer.h"
 
+#include "meta/Notification.h"
+
 #include "swss/producertable.h"
 #include "swss/consumertable.h"
 #include "swss/notificationconsumer.h"

diff --git a/lib/inc/RedisRemoteSaiInterface.h b/lib/inc/RedisRemoteSaiInterface.h
@@ -3,14 +3,15 @@
 #include "RemoteSaiInterface.h"
 #include "SwitchContainer.h"
 #include "VirtualObjectIdManager.h"
-#include "Notification.h"
 #include "Recorder.h"
 #include "RedisVidIndexGenerator.h"
 #include "SkipRecordAttrContainer.h"
 #include "RedisChannel.h"
 #include "SwitchConfigContainer.h"
 #include "ContextConfig.h"
 
+#include "meta/Notification.h"
+
 #include "swss/producertable.h"
 #include "swss/consumertable.h"
 #include "swss/notificationconsumer.h"

diff --git a/lib/inc/Sai.h b/lib/inc/Sai.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Notification.h"
 #include "Recorder.h"
 #include "Context.h"
 
 #include "meta/Meta.h"
+#include "meta/Notification.h"
 
 #include "swss/logger.h"
 

diff --git a/lib/src/ClientSai.cpp b/lib/src/ClientSai.cpp
@@ -4,12 +4,12 @@
 #include "ZeroMQChannel.h"
 #include "Utils.h"
 #include "sairediscommon.h"
-#include "NotificationFactory.h"
 #include "ClientConfig.h"
 
 #include "swss/logger.h"
 
 #include "meta/sai_serialize.h"
+#include "meta/NotificationFactory.h"
 #include "meta/SaiAttributeList.h"
 #include "meta/PerformanceIntervalTimer.h"
 #include "meta/Globals.h"

diff --git a/lib/src/RedisRemoteSaiInterface.cpp b/lib/src/RedisRemoteSaiInterface.cpp
@@ -1,6 +1,5 @@
 #include "RedisRemoteSaiInterface.h"
 #include "Utils.h"
-#include "NotificationFactory.h"
 #include "Recorder.h"
 #include "VirtualObjectIdManager.h"
 #include "SkipRecordAttrContainer.h"
@@ -9,6 +8,7 @@
 
 #include "sairediscommon.h"
 
+#include "meta/NotificationFactory.h"
 #include "meta/sai_serialize.h"
 #include "meta/SaiAttributeList.h"
 #include "meta/PerformanceIntervalTimer.h"

diff --git a/vslib/inc/EventPayloadNotification.h b/vslib/inc/EventPayloadNotification.h
@@ -6,7 +6,7 @@ extern "C"{
 
 #include "EventPayload.h"
 
-#include "lib/inc/Notification.h"
+#include "meta/Notification.h"
 
 namespace saivs
 {