TEST DO NOT MERGE - OTAI contecpt

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = meta lib vslib proxylib pyext
+SUBDIRS = meta lib vslib proxylib
 
 if SYNCD
 SUBDIRS += syncd saiplayer saidump saidiscovery saisdkdump saiasiccmp tests unittest

configure.ac

@@ -174,7 +174,7 @@ CXXFLAGS_COMMON+=" -Winvalid-pch"
 CXXFLAGS_COMMON+=" -Wmissing-field-initializers"
 CXXFLAGS_COMMON+=" -Wmissing-format-attribute"
 CXXFLAGS_COMMON+=" -Wmissing-include-dirs"
-CXXFLAGS_COMMON+=" -Wmissing-noreturn"
+CXXFLAGS_COMMON+=" -Wno-missing-noreturn"
 CXXFLAGS_COMMON+=" -Wno-aggregate-return"
 CXXFLAGS_COMMON+=" -Wno-padded"
 CXXFLAGS_COMMON+=" -Wno-switch-enum"
@@ -223,6 +223,7 @@ AC_ARG_WITH(extra-libsai-ldflags,
 [AC_SUBST(EXTRA_LIBSAI_LDFLAGS, "${withval}")])
 
 AC_SUBST(SAIINC, "-I\$(top_srcdir)/SAI/inc -I\$(top_srcdir)/SAI/experimental -I\$(top_srcdir)/SAI/meta")
+AC_SUBST(OTAIINC, "-I\$(top_srcdir)/OTAI/inc -I\$(top_srcdir)/OTAI/meta")
 
 AM_COND_IF([SYNCD], [
 AM_COND_IF([SAIVS], [], [
@@ -274,11 +275,11 @@ AC_CHECK_FUNCS(sai_bulk_object_clear_stats sai_bulk_object_get_stats)
 CXXFLAGS="$SAVED_FLAGS"
 ])
 
-AC_DEFINE([SAIREDIS_GIT_REVISION],
+AC_DEFINE([OTAIREDIS_GIT_REVISION],
         "[m4_esyscmd([echo -n $(git rev-parse --short HEAD || echo 0000000)])]",
         [sairedis git revision information])
 
-AC_DEFINE([SAI_GIT_REVISION],
+AC_DEFINE([OTAI_GIT_REVISION],
         "[m4_esyscmd([echo -n $(cd SAI && git rev-parse --short HEAD || echo 0000000)])]",
         [SAI git revision information])
 

lib/Channel.cpp

@@ -1,15 +1,15 @@
 #include "Channel.h"
 
-#include "sairedis.h"
+#include "otairedis.h"
 
 #include "swss/logger.h"
 
-using namespace sairedis;
+using namespace otairedis;
 
 Channel::Channel(
         _In_ Callback callback):
     m_callback(callback),
-    m_responseTimeoutMs(SAI_REDIS_DEFAULT_SYNC_OPERATION_RESPONSE_TIMEOUT)
+    m_responseTimeoutMs(OTAI_REDIS_DEFAULT_SYNC_OPERATION_RESPONSE_TIMEOUT)
 {
     SWSS_LOG_ENTER();
 

lib/Channel.h

@@ -7,13 +7,13 @@
 #include "swss/sal.h"
 
 extern "C" {
-#include "sai.h"
+#include "otai.h"
 }
 
 #include <memory>
 #include <functional>
 
-namespace sairedis
+namespace otairedis
 {
     class Channel
     {
@@ -51,7 +51,7 @@ namespace sairedis
                     _In_ const std::string& key,
                     _In_ const std::string& command) = 0;
 
-            virtual sai_status_t wait(
+            virtual otai_status_t wait(
                     _In_ const std::string& command,
                     _Out_ swss::KeyOpFieldsValuesTuple& kco) = 0;
 

lib/ClientConfig.cpp

@@ -8,11 +8,11 @@
 
 using json = nlohmann::json;
 
-using namespace sairedis;
+using namespace otairedis;
 
 ClientConfig::ClientConfig():
-    m_zmqEndpoint("ipc:///tmp/saiServer"),
-    m_zmqNtfEndpoint("ipc:///tmp/saiServerNtf")
+    m_zmqEndpoint("ipc:///tmp/otaiServer"),
+    m_zmqNtfEndpoint("ipc:///tmp/otaiServerNtf")
 {
     SWSS_LOG_ENTER();
 

lib/ClientConfig.h

@@ -5,7 +5,7 @@
 #include <memory>
 #include <string>
 
-namespace sairedis
+namespace otairedis
 {
     class ClientConfig
     {