Update orchagent to support new field pfcwd_sw_enable

cfgmgr/buffermgr.cpp

@@ -18,6 +18,7 @@ using namespace swss;
 BufferMgr::BufferMgr(DBConnector *cfgDb, DBConnector *applDb, string pg_lookup_file, const vector<string> &tableNames) :
         Orch(cfgDb, tableNames),
         m_cfgPortTable(cfgDb, CFG_PORT_TABLE_NAME),
+        m_cfgPortQosMapTable(cfgDb, CFG_PORT_QOS_MAP_TABLE_NAME),
         m_cfgCableLenTable(cfgDb, CFG_PORT_CABLE_LEN_TABLE_NAME),
         m_cfgBufferProfileTable(cfgDb, CFG_BUFFER_PROFILE_TABLE_NAME),
         m_cfgBufferPgTable(cfgDb, CFG_BUFFER_PG_TABLE_NAME),
@@ -133,7 +134,7 @@ Create/update two tables: profile (in m_cfgBufferProfileTable) and port buffer (
         }
     }
 */
-task_process_status BufferMgr::doSpeedUpdateTask(string port, bool admin_up)
+task_process_status BufferMgr::doSpeedUpdateTask(string port, bool admin_up, const string& pfc_enable)
 {
     string cable;
     string speed;
@@ -156,7 +157,7 @@ task_process_status BufferMgr::doSpeedUpdateTask(string port, bool admin_up)
     string buffer_profile_key = "pg_lossless_" + speed + "_" + cable + "_profile";
     string profile_ref = buffer_profile_key;
 
-    vector<string> lossless_pgs = tokenize(LOSSLESS_PGS, ',');
+    vector<string> lossless_pgs = tokenize(pfc_enable, ',');
     for (auto lossless_pg : lossless_pgs)
     {
         vector<FieldValueTuple> fvVectorPg, fvVectorProfile;
@@ -350,6 +351,21 @@ void BufferMgr::doBufferMetaTask(Consumer &consumer)
     }
 }
 
+/*
+Read pfc_enable entry from PORT_QOS_MAP to decide on which queue to
+apply lossless PG.
+Return the hardcoded value '3-4' if failed to get that value
+*/
+string BufferMgr::getPfcEnableQueuesForPort(std::string port)
+{
+    string pfc_enable;
+    if (!m_cfgPortQosMapTable.hget(port, "pfc_enable", pfc_enable))
+    {
+        return LOSSLESS_PGS;
+    }
+    return pfc_enable;
+}
+
 void BufferMgr::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
@@ -442,7 +458,8 @@ void BufferMgr::doTask(Consumer &consumer)
                 if (m_speedLookup.count(port) != 0)
                 {
                     // create/update profile for port
-                    task_status = doSpeedUpdateTask(port, admin_up);
+                    string lossless_pgs = getPfcEnableQueuesForPort(port);
+                    task_status = doSpeedUpdateTask(port, admin_up, lossless_pgs);
                 }
 
                 if (task_status != task_process_status::task_success)

cfgmgr/buffermgr.h

@@ -11,7 +11,7 @@
 namespace swss {
 
 #define INGRESS_LOSSLESS_PG_POOL_NAME "ingress_lossless_pool"
-#define LOSSLESS_PGS "2,3-4,6"
+#define LOSSLESS_PGS "3-4"
 
 #define BUFFERMGR_TIMER_PERIOD 10
 
@@ -43,6 +43,7 @@ class BufferMgr : public Orch
     Table m_cfgBufferProfileTable;
     Table m_cfgBufferPgTable;
     Table m_cfgLosslessPgPoolTable;
+    Table m_cfgPortQosMapTable;
 
     ProducerStateTable m_applBufferProfileTable;
     ProducerStateTable m_applBufferPgTable;
@@ -60,13 +61,14 @@ class BufferMgr : public Orch
     std::string getPgPoolMode();
     void readPgProfileLookupFile(std::string);
     task_process_status doCableTask(std::string port, std::string cable_length);
-    task_process_status doSpeedUpdateTask(std::string port, bool admin_up);
+    task_process_status doSpeedUpdateTask(std::string port, bool admin_up, const std::string &pfc_enable);
     void doBufferTableTask(Consumer &consumer, ProducerStateTable &applTable);
 
     void transformSeperator(std::string &name);
 
     void doTask(Consumer &consumer);
     void doBufferMetaTask(Consumer &consumer);
+    std::string getPfcEnableQueuesForPort(std::string port); 
 };
 
 }

tests/test_buffer_traditional.py

@@ -3,7 +3,7 @@
 
 
 class TestBuffer(object):
-    LOSSLESS_PGS = [2, 3, 4, 6]
+    lossless_pgs = []
     INTF = "Ethernet0"
 
     def setup_db(self, dvs):
@@ -14,6 +14,10 @@ def setup_db(self, dvs):
 
         # enable PG watermark
         self.set_pg_wm_status('enable')
+
+    def get_pfc_enable_queues(self):
+        qos_map = self.config_db.get_entry("PORT_QOS_MAP", self.INTF)
+        self.lossless_pgs = qos_map['pfc_enable'].split(',')
 
     def get_pg_oid(self, pg):
         fvs = dict()
@@ -61,7 +65,7 @@ def setup_teardown_test(self, dvs):
         try:
             self.setup_db(dvs)
             pg_name_map = dict()
-            for pg in self.LOSSLESS_PGS:
+            for pg in self.lossless_pgs:
                 pg_name = "{}:{}".format(self.INTF, pg)
                 pg_name_map[pg_name] = self.get_pg_oid(pg_name)
             yield pg_name_map
@@ -119,7 +123,8 @@ def test_zero_cable_len_profile_update(self, dvs, setup_teardown_test):
             self.app_db.wait_for_deleted_entry("BUFFER_PROFILE_TABLE", test_lossless_profile)
 
             # buffer pgs should still point to the original buffer profile
-            self.app_db.wait_for_field_match("BUFFER_PG_TABLE", self.INTF + ":3-4", {"profile": orig_lossless_profile})
+            for pg in self.lossless_pgs:
+                self.app_db.wait_for_field_match("BUFFER_PG_TABLE", self.INTF + ":" + pg, {"profile": orig_lossless_profile})
             fvs = dict()
             for pg in self.pg_name_map:
                 fvs["SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE"] = self.buf_pg_profile[pg]