[syncd] Comparison logic log also current attr value on set operation (…

…#763) Signed-off-by: kcudnik <kcudnik@gmail.com>
sonic-net · Jan 12, 2021 · cc560f5 · cc560f5
1 parent 7d31204
commit cc560f5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/syncd/AsicOperation.h b/syncd/AsicOperation.h
@@ -7,6 +7,7 @@ extern "C"{
 #include "swss/table.h"
 
 #include <memory>
+#include <string>
 
 namespace syncd
 {
@@ -31,5 +32,7 @@ namespace syncd
             bool m_isRemove;
 
             std::shared_ptr<swss::KeyOpFieldsValuesTuple> m_op;
+
+            std::string m_currentValue;
     };
 }
diff --git a/syncd/AsicView.cpp b/syncd/AsicView.cpp
@@ -568,6 +568,8 @@ void AsicView::asicSetAttribute(
 
     auto meta = attr->getAttrMetadata();
 
+    auto currentAttr = currentObj->tryGetSaiAttr(meta->attrid);
+
     if (attr->isObjectIdAttr())
     {
         if (currentObj->hasAttr(meta->attrid))
@@ -616,6 +618,12 @@ void AsicView::asicSetAttribute(
 
     m_asicOperations.push_back(AsicOperation(m_asicOperationId, vid, false, kco));
 
+    if (currentAttr)
+    {
+        // if current attribute exists, save it value for log purpose
+        m_asicOperations.rbegin()->m_currentValue = currentAttr->getStrAttrValue();
+    }
+
     dumpRef("set");
 }
 

diff --git a/syncd/ComparisonLogic.cpp b/syncd/ComparisonLogic.cpp
@@ -3431,9 +3431,19 @@ void ComparisonLogic::executeOperationsOnAsic()
 
             const auto &values = kfvFieldsValues(*op.m_op);
 
-            for (auto v: values)
+            if (op.m_currentValue.size() && opp == "set")
             {
-                SWSS_LOG_NOTICE("- %s %s", fvField(v).c_str(), fvValue(v).c_str());
+                SWSS_LOG_NOTICE("- %s %s (current: %s)",
+                        fvField(values.at(0)).c_str(),
+                        fvValue(values.at(0)).c_str(),
+                        op.m_currentValue.c_str());
+            }
+            else
+            {
+                for (auto v: values)
+                {
+                    SWSS_LOG_NOTICE("- %s %s", fvField(v).c_str(), fvValue(v).c_str());
+                }
             }
         }