[sflow] Fix ansible test problems caused by enabling sflow

orchagent/copporch.cpp

@@ -102,7 +102,6 @@ CoppOrch::CoppOrch(vector<TableConnector> &tableConnectors) :
     initDefaultHostIntfTable();
     initDefaultTrapGroup();
     initDefaultTrapIds();
-    enable_sflow_trap = false;
 };
 
 void CoppOrch::initDefaultHostIntfTable()
@@ -477,14 +476,6 @@ task_process_status CoppOrch::processCoppRule(Consumer& consumer)
             if (fvField(*i) == copp_trap_id_list)
             {
                 trap_id_list = tokenize(fvValue(*i), list_item_delimiter);
-                auto it = std::find(trap_id_list.begin(), trap_id_list.end(), "sample_packet");
-                if (it != trap_id_list.end())
-                {
-                    if (!enable_sflow_trap)
-                    {
-                        return task_process_status::task_need_retry;
-                    }
-                }
             }
             else if (fvField(*i) == copp_queue_field)
             {
@@ -775,49 +766,9 @@ task_process_status CoppOrch::processCoppRule(Consumer& consumer)
     return task_process_status::task_success;
 }
 
-/* Program Sflow trap once we get sflow enable command */
-void CoppOrch::coppProcessSflow(Consumer &consumer)
-{
-    auto it = consumer.m_toSync.begin();
-
-    while (it != consumer.m_toSync.end())
-    {
-        auto tuple = it->second;
-        string op = kfvOp(tuple);
-
-        /*
-         * Need to handled just 'config sflow enable' command to install the sflow trap group
-         * for the first time to ensure support of genetlink attributes. Rest of the fields or
-         * disable value or DEL command are not required to be handled
-         *
-         */
-        if (op == SET_COMMAND)
-        {
-            for (auto i : kfvFieldsValues(tuple))
-            {
-                if (fvField(i) == "admin_state")
-                {
-                    if (fvValue(i) == "up")
-                    {
-                        enable_sflow_trap = true;
-                    }
-                }
-            }
-        }
-        it = consumer.m_toSync.erase(it);
-    }
-}
-
 void CoppOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
-    string table_name = consumer.getTableName();
-
-    if (table_name == CFG_SFLOW_TABLE_NAME)
-    {
-        coppProcessSflow(consumer);
-        return;
-    }
 
     if (!gPortsOrch->allPortsReady())
     {

orchagent/copporch.h

@@ -49,7 +49,6 @@ class CoppOrch : public Orch
     CoppOrch(std::vector<TableConnector> &tableConnectors);
 protected:
     object_map m_trap_group_map;
-    bool       enable_sflow_trap;
 
     TrapGroupPolicerTable m_trap_group_policer_map;
     TrapIdTrapObjectsTable m_syncdTrapIds;

orchagent/orchdaemon.cpp

@@ -127,11 +127,9 @@ bool OrchDaemon::init()
     gNeighOrch = new NeighOrch(m_applDb, APP_NEIGH_TABLE_NAME, gIntfsOrch);
     gRouteOrch = new RouteOrch(m_applDb, APP_ROUTE_TABLE_NAME, gNeighOrch, gIntfsOrch, vrf_orch);
 
-    TableConnector confDbSflowTable(m_configDb, CFG_SFLOW_TABLE_NAME);
     TableConnector appCoppTable(m_applDb, APP_COPP_TABLE_NAME);
 
     vector<TableConnector> copp_table_connectors = {
-        confDbSflowTable,
         appCoppTable
     };
     CoppOrch  *copp_orch  = new CoppOrch(copp_table_connectors);

swssconfig/sample/00-copp.config.json

@@ -55,5 +55,21 @@
             "red_action":"drop"
         },
         "OP": "SET"
+    },
+    {
+        "COPP_TABLE:trap.group.sflow": {
+            "trap_ids": "sample_packet",
+            "trap_action":"trap",
+            "trap_priority":"1",
+            "queue": "2",
+            "meter_type":"packets",
+            "mode":"sr_tcm",
+            "cir":"1000",
+            "cbs":"1000",
+            "red_action":"drop",
+            "genetlink_name":"psample",
+            "genetlink_mcgrp_name":"packets"
+        },
+        "OP": "SET"
     }
 ]