Revert "Fix and add unitest - draft"

This reverts commit 6b6fc3a.
sonic-net · Nov 28, 2024 · 932a732 · 932a732
1 parent 6b6fc3a
commit 932a732
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 66 deletions.
diff --git a/SAI b/SAI
diff --git a/lib/Recorder.cpp b/lib/Recorder.cpp
@@ -321,7 +321,7 @@ void Recorder::recordDbgGenDumpResponse(
 {
     SWSS_LOG_ENTER();
 
-    recordLine("G|" + sai_serialize_status(status));
+    recordLine("F|" + sai_serialize_status(status));
 }
 
 void Recorder::recordQueryAttributeCapability(

diff --git a/lib/RedisRemoteSaiInterface.cpp b/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);

diff --git a/proxylib/Proxy.cpp b/proxylib/Proxy.cpp
@@ -362,33 +362,9 @@ 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)
 {

diff --git a/proxylib/Proxy.h b/proxylib/Proxy.h
@@ -106,9 +106,6 @@ namespace saiproxy
             void processClearStats(
                     _In_ const swss::KeyOpFieldsValuesTuple &kco);
 
-            void processDbgGenerateDump(
-                    _In_ const swss::KeyOpFieldsValuesTuple &kco);
-
         private: // notifications
 
             void onFdbEvent(

diff --git a/proxylib/Sai.cpp b/proxylib/Sai.cpp
@@ -1133,11 +1133,7 @@ sai_status_t Sai::dbgGenerateDump(
 
     m_communicationChannel->set(key, entry, "dbg_gen_dump");
 
-    swss::KeyOpFieldsValuesTuple kco;
-
-    auto status = m_communicationChannel->wait("dbg_gen_dumpresponse", kco);
-
-    return status;
+    return SAI_STATUS_SUCCESS;
 }
 
 void Sai::updateNotifications(

diff --git a/unittest/lib/TestSai.cpp b/unittest/lib/TestSai.cpp
@@ -40,19 +40,6 @@ 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;

diff --git a/unittest/meta/TestDummySaiInterface.cpp b/unittest/meta/TestDummySaiInterface.cpp
@@ -20,17 +20,6 @@ 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;

diff --git a/unittest/vslib/TestVirtualSwitchSaiInterface.cpp b/unittest/vslib/TestVirtualSwitchSaiInterface.cpp
@@ -122,13 +122,6 @@ TEST_F(VirtualSwitchSaiInterfaceTest, queryApiVersion)
     EXPECT_EQ(m_vssai->queryApiVersion(&version), SAI_STATUS_SUCCESS);
 }
 
-TEST_F(VirtualSwitchSaiInterfaceTest, dbgGenerateDump)
-{
-    const std::string filePath = "/var/log/testDump.log";
-
-    EXPECT_EQ(m_vssai->dbgGenerateDump(filePath.c_str()), SAI_STATUS_SUCCESS);
-}
-
 TEST_F(VirtualSwitchSaiInterfaceTest, bulkGet)
 {
     sai_object_id_t oids[1] = {0};
+1 −0		.gitignore
+3 −1		Makefile
+85 −0		doc/ECMP/NextHopGroup_with_members.md
+425 −0		doc/SAI-Proposal-Prefix-Compression.md
+1 −1		experimental/saiexperimentaldashappliance.h
+27 −0		experimental/saiexperimentaldashflow.h
+217 −8		experimental/saiexperimentaldashtunnel.h
+44 −1		experimental/saitypesextensions.h
+1 −0		inc/sai.h
+70 −2		inc/saiacl.h
+11 −0		inc/saimacsec.h
+46 −0		inc/sainexthopgroup.h
+6 −0		inc/saiobject.h
+9 −0		inc/saipolicer.h
+313 −0		inc/saiprefixcompression.h
+9 −0		inc/sairouterinterface.h
+9 −0		inc/saischeduler.h
+16 −1		inc/saisrv6.h
+31 −0		inc/saitypes.h
+9 −0		inc/saiudf.h
+5 −2		meta/Makefile
+4 −0		meta/aspell.en.pws
+48 −0		meta/attrversion.sh
+2 −1		meta/gensairpc.pl
+77 −1		meta/parse.pl
+23 −0		meta/saimetadatatypes.h
+22 −0		meta/saisanitycheck.c
+2 −0		meta/style.pm