Sflow fix to avoid NULL in field. (sonic-net#1531)

Added Support of handling NULL fields while removing sflow sampling rate.
theasianpianist · Dec 19, 2020 · 3195b8f · 3195b8f
1 parent fcd1e6d
commit 3195b8f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/cfgmgr/sflowmgr.cpp b/cfgmgr/sflowmgr.cpp
@@ -194,23 +194,32 @@ void SflowMgr::sflowGetPortInfo(vector<FieldValueTuple> &fvs, SflowPortInfo &loc
     fvs.push_back(fv2);
 }
 
-void SflowMgr::sflowCheckAndFillValues(string alias, vector<FieldValueTuple> &fvs)
+void SflowMgr::sflowCheckAndFillValues(string alias, vector<FieldValueTuple> &values,
+                                       vector<FieldValueTuple> &fvs)
 {
     string rate;
     bool admin_present = false;
     bool rate_present = false;
 
-    for (auto i : fvs)
+    for (auto i : values)
     {
         if (fvField(i) == "sample_rate")
         {
             rate_present = true;
             m_sflowPortConfMap[alias].rate = fvValue(i);
+            FieldValueTuple fv(fvField(i), fvValue(i));
+            fvs.push_back(fv);
         }
         if (fvField(i) == "admin_state")
         {
             admin_present = true;
             m_sflowPortConfMap[alias].admin = fvValue(i);
+            FieldValueTuple fv(fvField(i), fvValue(i));
+            fvs.push_back(fv);
+        }
+        if (fvField(i) == "NULL")
+        {
+            continue;
         }
     }
 
@@ -326,11 +335,12 @@ void SflowMgr::doTask(Consumer &consumer)
                         it++;
                         continue;
                     }
-                    sflowCheckAndFillValues(key,values);
+                    vector<FieldValueTuple> fvs;
+                    sflowCheckAndFillValues(key, values, fvs);
                     m_sflowPortConfMap[key].local_conf = true;
                     if (m_gEnable)
                     {
-                        m_appSflowSessionTable.set(key, values);
+                        m_appSflowSessionTable.set(key, fvs);
                     }
                 }
             }

diff --git a/cfgmgr/sflowmgr.h b/cfgmgr/sflowmgr.h
@@ -59,7 +59,7 @@ class SflowMgr : public Orch
     void sflowUpdatePortInfo(Consumer &consumer);
     void sflowHandleSessionAll(bool enable);
     void sflowHandleSessionLocal(bool enable);
-    void sflowCheckAndFillValues(std::string alias, std::vector<FieldValueTuple> &fvs);
+    void sflowCheckAndFillValues(std::string alias, std::vector<FieldValueTuple> &values, std::vector<FieldValueTuple> &fvs);
     void sflowGetPortInfo(std::vector<FieldValueTuple> &fvs, SflowPortInfo &local_info);
     void sflowGetGlobalInfo(std::vector<FieldValueTuple> &fvs, std::string speed);
 };