diff --git a/orchagent/copporch.cpp b/orchagent/copporch.cpp index bfe4e5561c..8c40e9b27e 100644 --- a/orchagent/copporch.cpp +++ b/orchagent/copporch.cpp @@ -89,8 +89,8 @@ const vector default_trap_ids = { SAI_HOSTIF_TRAP_TYPE_TTL_ERROR }; -CoppOrch::CoppOrch(DBConnector *db, vector &tableNames) : - Orch(db, tableNames) +CoppOrch::CoppOrch(vector &tableConnectors) : + Orch( tableConnectors) { SWSS_LOG_ENTER(); @@ -831,7 +831,7 @@ void CoppOrch::doTask(Consumer &consumer) return; } - if (table_name == APP_SFLOW_TABLE_NAME) + if (table_name == CFG_SFLOW_TABLE_NAME) { coppProcessSflow(consumer); return; diff --git a/orchagent/copporch.h b/orchagent/copporch.h index a309d6b118..84f53d19c6 100644 --- a/orchagent/copporch.h +++ b/orchagent/copporch.h @@ -46,7 +46,7 @@ typedef map TrapIdHostIfTableMap; class CoppOrch : public Orch { public: - CoppOrch(DBConnector *db, vector &tableNames); + CoppOrch(vector &tableConnectors); protected: object_map m_trap_group_map; bool enable_sflow_trap; diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp index 59324961f2..bf85ff691c 100644 --- a/orchagent/orchdaemon.cpp +++ b/orchagent/orchdaemon.cpp @@ -115,11 +115,15 @@ bool OrchDaemon::init() gIntfsOrch = new IntfsOrch(m_applDb, APP_INTF_TABLE_NAME, vrf_orch); gNeighOrch = new NeighOrch(m_applDb, APP_NEIGH_TABLE_NAME, gIntfsOrch); gRouteOrch = new RouteOrch(m_applDb, APP_ROUTE_TABLE_NAME, gNeighOrch); - vector copp_tables = { - APP_COPP_TABLE_NAME, - APP_SFLOW_TABLE_NAME + + TableConnector confDbSflowTable(m_configDb, CFG_SFLOW_TABLE_NAME); + TableConnector appCoppTable(m_applDb, APP_COPP_TABLE_NAME); + + vector copp_table_connectors = { + confDbSflowTable, + appCoppTable }; - CoppOrch *copp_orch = new CoppOrch(m_applDb, copp_tables); + CoppOrch *copp_orch = new CoppOrch(copp_table_connectors); TunnelDecapOrch *tunnel_decap_orch = new TunnelDecapOrch(m_applDb, APP_TUNNEL_DECAP_TABLE_NAME); VxlanTunnelOrch *vxlan_tunnel_orch = new VxlanTunnelOrch(m_applDb, APP_VXLAN_TUNNEL_TABLE_NAME);