Add sairedis lib unit tests (sonic-net#919)

* [tests] Remove new operator from create objects * [sairedis] Move config examples from src dir to lib dir * [sairedis] Correct endpoint naming in client and server * Add ClientConfig tests * Add ClientServerSai tests * Fix ClientConfig tests * Add Context tests * Add ContextConfig tests * Add ContextConfigContainer tests * Add Utils tests * Fix Switch tests
Metaswitch · Sep 4, 2021 · d8eb0ea · d8eb0ea
1 parent 536af40
commit d8eb0ea
Show file tree

Hide file tree

Showing 16 changed files with 276 additions and 9 deletions.
diff --git a/lib/ClientConfig.cpp b/lib/ClientConfig.cpp
@@ -55,7 +55,7 @@ std::shared_ptr<ClientConfig> ClientConfig::loadFromFile(
         auto cc = std::make_shared<ClientConfig>();
 
         cc->m_zmqEndpoint = j["zmq_endpoint"];
-        cc->m_zmqNtfEndpoint = j["zmq_endpoint_ntf"];
+        cc->m_zmqNtfEndpoint = j["zmq_ntf_endpoint"];
 
         SWSS_LOG_NOTICE("client config: %s, %s",
                 cc->m_zmqEndpoint.c_str(),

diff --git a/lib/ServerConfig.cpp b/lib/ServerConfig.cpp
@@ -55,7 +55,7 @@ std::shared_ptr<ServerConfig> ServerConfig::loadFromFile(
         auto cc = std::make_shared<ServerConfig>();
 
         cc->m_zmqEndpoint = j["zmq_endpoint"];
-        cc->m_zmqNtfEndpoint = j["zmq_endpoint_ntf"];
+        cc->m_zmqNtfEndpoint = j["zmq_ntf_endpoint"];
 
         SWSS_LOG_NOTICE("server config: %s, %s",
                 cc->m_zmqEndpoint.c_str(),

diff --git a/lib/src/client_config.json → lib/client_config.json b/lib/src/client_config.json → lib/client_config.json
diff --git a/lib/src/context_config.json → lib/context_config.json b/lib/src/context_config.json → lib/context_config.json
diff --git a/unittest/lib/Makefile.am b/unittest/lib/Makefile.am
@@ -6,7 +6,13 @@ LDADD_GTEST = -L/usr/src/gtest -lgtest -lgtest_main
 
 tests_SOURCES = \
 				main.cpp \
-				TestSwitch.cpp
+				TestSwitch.cpp \
+				TestClientConfig.cpp \
+				TestClientServerSai.cppa \
+				TestContext.cpp \
+				TestContextConfig.cpp \
+				TestContextConfigContainer.cpp \
+				TestUtils.cpp
 
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
 tests_LDADD = $(LDADD_GTEST) $(top_srcdir)/lib/libSaiRedis.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
@@ -62,4 +68,4 @@ testslibsairedis_SOURCES =	main_libsairedis.cpp \
 testslibsairedis_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
 testslibsairedis_LDADD = $(LDADD_GTEST) -L$(top_srcdir)/lib/.libs -lsairedis -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
 
-TESTS = tests testslibsairedis
+TESTS = testslibsairedis tests
diff --git a/unittest/lib/TestClientConfig.cpp b/unittest/lib/TestClientConfig.cpp
@@ -0,0 +1,14 @@
+#include "ClientConfig.h"
+
+#include <gtest/gtest.h>
+
+using namespace sairedis;
+
+TEST(ClientConfig, loadFromFile)
+{
+    EXPECT_NE(ClientConfig::loadFromFile("non_existing"), nullptr);
+
+    EXPECT_NE(ClientConfig::loadFromFile("files/client_config_bad.txt"), nullptr);
+
+    EXPECT_NE(ClientConfig::loadFromFile("files/client_config_ok.txt"), nullptr);
+}
diff --git a/unittest/lib/TestClientServerSai.cpp b/unittest/lib/TestClientServerSai.cpp
@@ -0,0 +1,83 @@
+#include "ClientServerSai.h"
+
+#include "swss/logger.h"
+
+#include <gtest/gtest.h>
+
+using namespace sairedis;
+
+static const char* profile_get_value(
+        _In_ sai_switch_profile_id_t profile_id,
+        _In_ const char* variable)
+{
+    SWSS_LOG_ENTER();
+
+    if (variable == NULL)
+        return NULL;
+
+    return nullptr;
+}
+
+static int profile_get_next_value(
+        _In_ sai_switch_profile_id_t profile_id,
+        _Out_ const char** variable,
+        _Out_ const char** value)
+{
+    SWSS_LOG_ENTER();
+
+    return 0;
+}
+
+static sai_service_method_table_t test_services = {
+    profile_get_value,
+    profile_get_next_value
+};
+
+TEST(ClientServerSai, ctr)
+{
+    auto css = std::make_shared<ClientServerSai>();
+}
+
+TEST(ClientServerSai, initialize)
+{
+    auto css = std::make_shared<ClientServerSai>();
+
+    EXPECT_NE(SAI_STATUS_SUCCESS, css->initialize(1, nullptr));
+
+    EXPECT_NE(SAI_STATUS_SUCCESS, css->initialize(0, nullptr));
+
+    EXPECT_EQ(SAI_STATUS_SUCCESS, css->initialize(0, &test_services));
+
+    css = nullptr; // invoke uninitialize in destructor
+
+    css = std::make_shared<ClientServerSai>();
+
+    EXPECT_EQ(SAI_STATUS_SUCCESS, css->initialize(0, &test_services));
+
+    EXPECT_NE(SAI_STATUS_SUCCESS, css->initialize(0, &test_services));
+}
+
+TEST(ClientServerSai, objectTypeQuery)
+{
+    auto css = std::make_shared<ClientServerSai>();
+
+    EXPECT_EQ(SAI_OBJECT_TYPE_NULL, css->objectTypeQuery(0x1111111111111111L));
+}
+
+TEST(ClientServerSai, switchIdQuery)
+{
+    auto css = std::make_shared<ClientServerSai>();
+
+    EXPECT_EQ(SAI_NULL_OBJECT_ID, css->switchIdQuery(0x1111111111111111L));
+}
+
+TEST(ClientServerSai, logSet)
+{
+    auto css = std::make_shared<ClientServerSai>();
+
+    EXPECT_NE(SAI_STATUS_SUCCESS, css->logSet(SAI_API_PORT, SAI_LOG_LEVEL_NOTICE));
+
+    EXPECT_EQ(SAI_STATUS_SUCCESS, css->initialize(0, &test_services));
+
+    EXPECT_EQ(SAI_STATUS_SUCCESS, css->logSet(SAI_API_PORT, SAI_LOG_LEVEL_NOTICE));
+}
diff --git a/unittest/lib/TestContext.cpp b/unittest/lib/TestContext.cpp
@@ -0,0 +1,31 @@
+#include "Context.h"
+
+#include "swss/logger.h"
+
+#include <gtest/gtest.h>
+
+using namespace sairedis;
+
+static sai_switch_notifications_t handle_notification(
+        _In_ std::shared_ptr<Notification> notification,
+        _In_ Context* context)
+{
+    SWSS_LOG_ENTER();
+
+    sai_switch_notifications_t ntf;
+
+    memset(&ntf, 0, sizeof(ntf));
+
+    return ntf;
+}
+
+TEST(Context, populateMetadata)
+{
+    auto recorder = std::make_shared<Recorder>();
+
+    auto cc = std::make_shared<ContextConfig>(0, "syncd", "ASIC_DB", "COUNTERS_DB","FLEX_DB", "STATE_DB");
+
+    auto ctx = std::make_shared<Context>(cc, recorder,handle_notification);
+
+    ctx->populateMetadata(0x212121212212121L);
+}
diff --git a/unittest/lib/TestContextConfig.cpp b/unittest/lib/TestContextConfig.cpp
@@ -0,0 +1,31 @@
+#include "ContextConfig.h"
+
+#include "swss/logger.h"
+
+#include <gtest/gtest.h>
+
+using namespace sairedis;
+
+TEST(ContextConfig, hasConflict)
+{
+    auto cc = std::make_shared<ContextConfig>(0, "syncd", "ASIC_DB", "COUNTERS_DB","FLEX_DB", "STATE_DB");
+
+    EXPECT_TRUE(cc->hasConflict(std::make_shared<ContextConfig>(0, "syncd", "ASIC_DB", "COUNTERS_DB","FLEX_DB", "STATE_DB")));
+    EXPECT_TRUE(cc->hasConflict(std::make_shared<ContextConfig>(1, "syncd", "ASIC_DB", "COUNTERS_DB","FLEX_DB", "STATE_DB")));
+    EXPECT_TRUE(cc->hasConflict(std::make_shared<ContextConfig>(1, "syncb", "ASIC_DB", "COUNTERS_DB","FLEX_DB", "STATE_DB")));
+    EXPECT_TRUE(cc->hasConflict(std::make_shared<ContextConfig>(1, "syncb", "ASIC_DD", "COUNTERS_DB","FLEX_DB", "STATE_DB")));
+    EXPECT_TRUE(cc->hasConflict(std::make_shared<ContextConfig>(1, "syncb", "ASIC_DD", "COUNTERS_DD","FLEX_DB", "STATE_DB")));
+    EXPECT_TRUE(cc->hasConflict(std::make_shared<ContextConfig>(1, "syncb", "ASIC_DD", "COUNTERS_DD","FLEX_DD", "STATE_DB")));
+    EXPECT_TRUE(cc->hasConflict(std::make_shared<ContextConfig>(1, "syncb", "ASIC_DD", "COUNTERS_DD","FLEX_DD", "STATE_DD")));
+
+    auto aa = std::make_shared<ContextConfig>(1, "syncb", "ASIC_DD", "COUNTERS_DD","FLEX_DD", "STATE_DD");
+
+    aa->m_zmqEndpoint = "AA";
+
+    EXPECT_TRUE(cc->hasConflict(aa));
+
+    aa->m_zmqNtfEndpoint = "AA";
+
+    EXPECT_FALSE(cc->hasConflict(aa));
+}
+
diff --git a/unittest/lib/TestContextConfigContainer.cpp b/unittest/lib/TestContextConfigContainer.cpp
@@ -0,0 +1,32 @@
+#include "ContextConfigContainer.h"
+
+#include "swss/logger.h"
+
+#include <gtest/gtest.h>
+
+using namespace sairedis;
+
+TEST(ContextConfigContainer, get)
+{
+    ContextConfigContainer ccc;
+
+    EXPECT_EQ(ccc.get(0), nullptr);
+}
+
+TEST(ContextConfigContainer, loadFromFile)
+{
+    ContextConfigContainer ccc;
+
+    EXPECT_NE(ccc.loadFromFile("files/ccc_bad.txt"), nullptr);
+}
+
+TEST(ContextConfigContainer, insert)
+{
+    ContextConfigContainer ccc;
+
+    auto cc = std::make_shared<ContextConfig>(0, "syncd", "ASIC_DB", "COUNTERS_DB","FLEX_DB", "STATE_DB");
+
+    ccc.insert(cc);
+
+    EXPECT_THROW(ccc.insert(cc), std::runtime_error);
+}
diff --git a/unittest/lib/TestSwitch.cpp b/unittest/lib/TestSwitch.cpp
@@ -2,9 +2,11 @@
 
 #include <gtest/gtest.h>
 
+#include <memory>
+
 using namespace sairedis;
 
 TEST(Switch, ctr)
 {
-    EXPECT_THROW(new Switch(SAI_NULL_OBJECT_ID), std::runtime_error);
+    EXPECT_THROW(std::make_shared<Switch>(SAI_NULL_OBJECT_ID), std::runtime_error);
 }
diff --git a/unittest/lib/TestUtils.cpp b/unittest/lib/TestUtils.cpp
@@ -0,0 +1,62 @@
+#include "Utils.h"
+
+#include "swss/logger.h"
+
+#include <gtest/gtest.h>
+
+using namespace sairedis;
+
+TEST(Utils, clearOidValues)
+{
+    sai_attribute_t attr;
+
+    sai_object_id_t oids[1];
+
+    attr.id = 1000;
+
+    EXPECT_THROW(Utils::clearOidValues(SAI_OBJECT_TYPE_NULL, 1, &attr), std::runtime_error);
+
+    attr.id = SAI_ACL_ENTRY_ATTR_FIELD_IN_PORT;
+
+    attr.value.aclfield.data.oid = 1;
+
+    Utils::clearOidValues(SAI_OBJECT_TYPE_ACL_ENTRY, 1, &attr);
+
+    EXPECT_EQ(attr.value.aclfield.data.oid, 0);
+
+    attr.id = SAI_ACL_ENTRY_ATTR_FIELD_IN_PORTS;
+
+    attr.value.aclfield.enable = true;
+
+    attr.value.aclfield.data.objlist.count = 1;
+    attr.value.aclfield.data.objlist.list = oids;
+
+    oids[0] = 1;
+
+    Utils::clearOidValues(SAI_OBJECT_TYPE_ACL_ENTRY, 1, &attr);
+
+    EXPECT_EQ(oids[0], 0);
+
+    attr.id = SAI_ACL_ENTRY_ATTR_ACTION_COUNTER;
+
+    attr.value.aclaction.parameter.oid = 1;
+
+    Utils::clearOidValues(SAI_OBJECT_TYPE_ACL_ENTRY, 1, &attr);
+
+    EXPECT_EQ(attr.value.aclaction.parameter.oid, 0);
+
+    attr.id = SAI_ACL_ENTRY_ATTR_ACTION_REDIRECT_LIST;
+
+    attr.value.aclaction.enable = true;
+
+    attr.value.aclaction.parameter.objlist.count = 1;
+    attr.value.aclaction.parameter.objlist.list = oids;
+
+    oids[0] = 1;
+
+    Utils::clearOidValues(SAI_OBJECT_TYPE_ACL_ENTRY, 1, &attr);
+
+    EXPECT_EQ(oids[0], 0);
+
+}
+
diff --git a/unittest/lib/files/ccc_bad.txt b/unittest/lib/files/ccc_bad.txt
@@ -0,0 +1 @@
+foo bar
diff --git a/unittest/lib/files/client_config_bad.txt b/unittest/lib/files/client_config_bad.txt
@@ -0,0 +1 @@
+foo bar
diff --git a/unittest/lib/files/client_config_ok.txt b/unittest/lib/files/client_config_ok.txt
@@ -0,0 +1,4 @@
+{
+    "zmq_endpoint": "ipc:///tmp/saiServer",
+    "zmq_ntf_endpoint": "ipc:///tmp/saiServerNtf"
+}
diff --git a/unittest/vslib/TestBuffer.cpp b/unittest/vslib/TestBuffer.cpp
@@ -8,7 +8,7 @@ using namespace saivs;
 
 TEST(Buffer, ctr)
 {
-    EXPECT_THROW(new Buffer(0,0), std::runtime_error);
+    EXPECT_THROW(std::make_shared<Buffer>(nullptr, 0), std::runtime_error);
 
     Buffer b((const uint8_t*)"foo", 3);
 }
@@ -22,7 +22,7 @@ TEST(Buffer, dtr)
 
 TEST(Buffer, getData)
 {
-    EXPECT_THROW(new Buffer(0,0), std::runtime_error);
+    EXPECT_THROW(std::make_shared<Buffer>(nullptr,0), std::runtime_error);
 
     Buffer b((const uint8_t*)"foo", 3);
 
@@ -31,7 +31,7 @@ TEST(Buffer, getData)
 
 TEST(Buffer, getSize)
 {
-    EXPECT_THROW(new Buffer(0,0), std::runtime_error);
+    EXPECT_THROW(std::make_shared<Buffer>(nullptr,0), std::runtime_error);
 
     Buffer b((const uint8_t*)"foo", 3);
 
@@ -40,7 +40,7 @@ TEST(Buffer, getSize)
 
 TEST(Buffer, flow)
 {
-    EXPECT_THROW(new Buffer(0,0), std::runtime_error);
+    EXPECT_THROW(std::make_shared<Buffer>(nullptr,0), std::runtime_error);
 
     Buffer b((const uint8_t*)"foo", 3);