Make proper names for asic view init and apply (sonic-net#22)

Acked-by: Shuotian Cheng <shuche@microsoft.com>
dmytroxshevchuk · May 12, 2016 · 52491ff · 52491ff
1 parent 6f0fcd3
commit 52491ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/src/sai_redis_switch.cpp b/lib/src/sai_redis_switch.cpp
@@ -8,8 +8,8 @@
 // to compiled state, then there is something wrong
 #define NOTIFY_SYNCD_TIMEOUT (60*1000)
 
-#define NOTIFY_SAI_COMPILE_VIEW  "sai_compile_view"
-#define NOTIFY_SAI_SWITCH_VIEW   "sai_switch_view"
+#define NOTIFY_SAI_INIT_VIEW    "SAI_INIT_VIEW"
+#define NOTIFY_SAI_APPLY_VIEW   "SAI_APPLY_VIEW"
 
 sai_switch_notification_t redis_switch_notifications;
 
@@ -144,7 +144,7 @@ sai_status_t redis_initialize_switch(
 
     SWSS_LOG_INFO("operation: '%s'", op.c_str());
 
-    if (op == NOTIFY_SAI_COMPILE_VIEW || op == NOTIFY_SAI_SWITCH_VIEW)
+    if (op == NOTIFY_SAI_INIT_VIEW || op == NOTIFY_SAI_APPLY_VIEW)
     {
         sai_status_t status = notify_syncd(op);
 

diff --git a/syncd/syncd.cpp b/syncd/syncd.cpp
@@ -874,15 +874,15 @@ void notifySyncd(swss::NotificationConsumer &consumer)
 
     sai_status_t status = SAI_STATUS_FAILURE;
 
-    if (op == NOTIFY_SAI_COMPILE_VIEW)
+    if (op == NOTIFY_SAI_INIT_VIEW)
     {
         // TODO
         SWSS_LOG_ERROR("op = %s - not implemented", op.c_str());
 
         status = SAI_STATUS_NOT_IMPLEMENTED;
     }
 
-    if (op == NOTIFY_SAI_SWITCH_VIEW)
+    if (op == NOTIFY_SAI_APPLY_VIEW)
     {
         // TODO
         SWSS_LOG_ERROR("op = %s - not implemented", op.c_str());

diff --git a/syncd/syncd.h b/syncd/syncd.h
@@ -42,8 +42,8 @@ extern "C" {
 #define DEFAULT_VIRTUAL_ROUTER_ID   "DEFAULT_VIRTUAL_ROUTER_ID"
 #define CPU_PORT_ID                 "CPU_PORT_ID"
 
-#define NOTIFY_SAI_COMPILE_VIEW  "sai_compile_view"
-#define NOTIFY_SAI_SWITCH_VIEW   "sai_switch_view"
+#define NOTIFY_SAI_INIT_VIEW        "SAI_INIT_VIEW"
+#define NOTIFY_SAI_APPLY_VIEW       "SAI_APPLY_VIEW"
 
 extern std::mutex g_mutex;