fix and add unittests - draft

Author: aviramd

lib/Recorder.cpp

@@ -321,7 +321,7 @@ void Recorder::recordDbgGenDumpResponse(
 {
     SWSS_LOG_ENTER();
 
-    recordLine("F|" + sai_serialize_status(status));
+    recordLine("G|" + sai_serialize_status(status));
 }
 
 void Recorder::recordQueryAttributeCapability(

lib/RedisRemoteSaiInterface.cpp

@@ -1926,7 +1926,7 @@ sai_status_t RedisRemoteSaiInterface::dbgGenerateDump(
 
     if (m_syncMode)
     {
-	SWSS_LOG_DEBUG("wait for generate dump response");
+        SWSS_LOG_DEBUG("wait for generate dump response");
         swss::KeyOpFieldsValuesTuple kco;
         auto status = m_communicationChannel->wait(REDIS_ASIC_STATE_COMMAND_DBG_GEN_DUMPRESPONSE, kco);
         m_recorder->recordDbgGenDumpResponse(status);

proxylib/Proxy.cpp

@@ -362,9 +362,33 @@ void Proxy::processSingleEvent(
     if (op == "clear_stats")
         return processClearStats(kco);
 
+    if (op == "dbg_gen_dump")
+        return processDbgGenerateDump(kco);
+
     SWSS_LOG_THROW("event op '%s' is not implemented, FIXME", op.c_str());
 }
 
+void Proxy::processDbgGenerateDump(
+        _In_ const swss::KeyOpFieldsValuesTuple &kco)
+{
+    SWSS_LOG_ENTER();
+
+    const auto& values = kfvFieldsValues(kco);
+    if (values.size() != 1)
+    {
+        SWSS_LOG_THROW("Invalid input: expected 1 arguments, received %zu", values.size());
+    }
+
+    auto& fieldValues = kfvFieldsValues(kco);
+
+    auto value = fvValue(fieldValues[0]);
+    const char* value_cstr = value.c_str();
+
+    sai_status_t status = m_vendorSai->dbgGenerateDump(value_cstr);
+
+    m_selectableChannel->set(sai_serialize_status(status), {} , "dbg_gen_dumpresponse");
+}
+
 void Proxy::processCreate(
         _In_ const swss::KeyOpFieldsValuesTuple &kco)
 {

proxylib/Proxy.h

@@ -106,6 +106,9 @@ namespace saiproxy
             void processClearStats(
                     _In_ const swss::KeyOpFieldsValuesTuple &kco);
 
+            void processDbgGenerateDump(
+                    _In_ const swss::KeyOpFieldsValuesTuple &kco);
+
         private: // notifications
 
             void onFdbEvent(

proxylib/Sai.cpp

@@ -1133,6 +1133,10 @@ sai_status_t Sai::dbgGenerateDump(
 
     m_communicationChannel->set(key, entry, "dbg_gen_dump");
 
+    /*swss::KeyOpFieldsValuesTuple kco;
+
+    return m_communicationChannel->wait("dbg_gen_dumpresponse", kco);*/
+
     return SAI_STATUS_SUCCESS;
 }
 

unittest/lib/TestClientSai.cpp

@@ -50,3 +50,13 @@ TEST(ClientSai, bulkGet)
                 statuses));
 }
 
+TEST(ClientSai, dbgGenerateDump)
+{
+    ClientSai sai;
+
+    sai.apiInitialize(0,&test_services);
+
+    const std::string filePath = "/var/log/dbgGenerateDump.log";
+
+    EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, sai.dbgGenerateDump(filePath.c_str()));
+}

unittest/lib/TestRedisRemoteSaiInterface.cpp

@@ -28,3 +28,14 @@ TEST(RedisRemoteSaiInterface, bulkGet)
                 statuses));
 }
 
+TEST(RedisRemoteSaiInterface, dbgGenerateDump)
+{
+    auto ctx = ContextConfigContainer::loadFromFile("foo");
+    auto rec = std::make_shared<Recorder>();
+
+    RedisRemoteSaiInterface sai(ctx->get(0), nullptr, rec);
+
+    const std::string filePath = "/var/log/testDump.log";
+
+    EXPECT_EQ(sai.dbgGenerateDump(filePath.c_str()), SAI_STATUS_SUCCESS);
+}

unittest/lib/TestSai.cpp

@@ -40,6 +40,19 @@ TEST(Sai, queryApiVersion)
     EXPECT_EQ(sai.queryApiVersion(&version), SAI_STATUS_SUCCESS);
 }
 
+TEST(Sai, dbgGenerateDump)
+{
+    Sai sai;
+
+    sai.apiInitialize(0,&test_services);
+
+    const std::string filePath = "/var/log/testDump.log";
+
+    auto status = sai.dbgGenerateDump(filePath.c_str());
+
+    EXPECT_EQ(status, SAI_STATUS_SUCCESS);
+}
+
 TEST(Sai, bulkGet)
 {
     Sai sai;

unittest/meta/TestDummySaiInterface.cpp

@@ -20,6 +20,17 @@ TEST(DummySaiInterface, queryApiVersion)
     EXPECT_EQ(sai.queryApiVersion(&version), SAI_STATUS_SUCCESS);
 }
 
+TEST(DummySaiInterface, dbgGenerateDump)
+{
+    DummySaiInterface sai;
+
+    sai.apiInitialize(0,0);
+
+    const std::string filePath = "/var/log/testDump.log";
+
+    EXPECT_EQ(sai.dbgGenerateDump(filePath.c_str()), SAI_STATUS_SUCCESS);
+}
+
 TEST(DummySaiInterface, bulkGet)
 {
     DummySaiInterface sai;

unittest/vslib/TestSai.cpp

@@ -24,5 +24,4 @@ TEST(Sai, bulkGet)
                 attrs,
                 SAI_BULK_OP_ERROR_MODE_STOP_ON_ERROR,
                 statuses));
-}
-
+}