Fix review comment

Author: Junchao-Mellanox

orchagent/Makefile.am

@@ -3,7 +3,6 @@ INCLUDES = -I $(top_srcdir)/lib \
            -I $(top_srcdir)/warmrestart \
            -I flex_counter \
            -I debug_counter \
-           -I flow_counter \
            -I pbh \
            -I nhg
 
@@ -91,9 +90,8 @@ orchagent_SOURCES = \
             bfdorch.cpp \
             srv6orch.cpp
 
-orchagent_SOURCES += flex_counter/flex_counter_manager.cpp flex_counter/flex_counter_stat_manager.cpp
+orchagent_SOURCES += flex_counter/flex_counter_manager.cpp flex_counter/flex_counter_stat_manager.cpp flex_counter/flow_counter_handler.cpp
 orchagent_SOURCES += debug_counter/debug_counter.cpp debug_counter/drop_counter.cpp
-orchagent_SOURCES += flow_counter/flow_counter_handler.cpp
 
 orchagent_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
 orchagent_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)

orchagent/copporch.cpp

@@ -121,7 +121,7 @@ const string default_trap_group = "default";
 const vector<sai_hostif_trap_type_t> default_trap_ids = {
     SAI_HOSTIF_TRAP_TYPE_TTL_ERROR
 };
-const uint HOSTIF_TRAP_COUNTER_POLLING_INTERVAL_MS = 1000;
+const uint HOSTIF_TRAP_COUNTER_POLLING_INTERVAL_MS = 10000;
 
 CoppOrch::CoppOrch(DBConnector* db, string tableName) :
     Orch(db, tableName),
@@ -758,7 +758,7 @@ void CoppOrch::doTask(SelectableTimer &timer)
             SWSS_LOG_INFO("Registering %s, id %s", it->second.c_str(), id.c_str());
 
             std::unordered_set<std::string> counter_stats;
-            FlowCounterHandler::getGenericCounterIdList(counter_stats);
+            FlowCounterHandler::getGenericCounterStatIdList(counter_stats);
             m_trap_counter_manager.setCounterIdList(it->first, CounterType::HOSTIF_TRAP, counter_stats);
             it = m_pendingAddToFlexCntr.erase(it);
         }

…nt/flow_counter/flow_counter_handler.cpp …nt/flex_counter/flow_counter_handler.cpporchagent/flow_counter/flow_counter_handler.cpp renamed to orchagent/flex_counter/flow_counter_handler.cpp orchagent/flow_counter/flow_counter_handler.cpp renamed to orchagent/flex_counter/flow_counter_handler.cpp

@@ -1,8 +1,7 @@
 FLEX_CTR_DIR = $(top_srcdir)/orchagent/flex_counter
 DEBUG_CTR_DIR = $(top_srcdir)/orchagent/debug_counter
-FLOW_CTR_DIR = $(top_srcdir)/orchagent/flow_counter
 
-INCLUDES = -I $(FLEX_CTR_DIR) -I $(DEBUG_CTR_DIR) -I $(FLOW_CTR_DIR) -I $(top_srcdir)/lib
+INCLUDES = -I $(FLEX_CTR_DIR) -I $(DEBUG_CTR_DIR) -I $(top_srcdir)/lib
 
 CFLAGS_SAI = -I /usr/include/sai
 
@@ -85,9 +84,8 @@ tests_SOURCES = aclorch_ut.cpp \
                 $(top_srcdir)/orchagent/bfdorch.cpp \
                 $(top_srcdir)/orchagent/srv6orch.cpp
 
-tests_SOURCES += $(FLEX_CTR_DIR)/flex_counter_manager.cpp $(FLEX_CTR_DIR)/flex_counter_stat_manager.cpp
+tests_SOURCES += $(FLEX_CTR_DIR)/flex_counter_manager.cpp $(FLEX_CTR_DIR)/flex_counter_stat_manager.cpp $(FLEX_CTR_DIR)/flow_counter_handler.cpp
 tests_SOURCES += $(DEBUG_CTR_DIR)/debug_counter.cpp $(DEBUG_CTR_DIR)/drop_counter.cpp
-tests_SOURCES += $(FLOW_CTR_DIR)/flow_counter_handler.cpp
 
 tests_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI)
 tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) -I$(top_srcdir)/orchagent