[FEC] Adding support of override based on attribute query of SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE

orchagent/portsorch.cpp

@@ -512,6 +512,18 @@ PortsOrch::PortsOrch(DBConnector *db, DBConnector *stateDb, vector<table_name_wi
         }
     }
 
+    sai_attr_capability_t attr_cap;
+    if (sai_query_attribute_capability(gSwitchId, SAI_OBJECT_TYPE_PORT,
+                                       SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE,
+                                       &attr_cap) != SAI_STATUS_SUCCESS)
+    {
+        SWSS_LOG_NOTICE("Unable to query autoneg fec mode override");
+    }
+    else if (attr_cap.set_implemented && attr_cap.create_implemented)
+    {
+        fec_override_sup = true;
+    }
+
     /* Get default 1Q bridge and default VLAN */
     sai_status_t status;
     sai_attribute_t attr;
@@ -1521,6 +1533,24 @@ bool PortsOrch::setPortFec(Port &port, sai_port_fec_mode_t fec_mode)
         }
     }
 
+    if (fec_override_sup)
+    {
+        attr.id = SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE;
+        attr.value.booldata = true;
+
+        status = sai_port_api->set_port_attribute(port.m_port_id, &attr);
+        if (status != SAI_STATUS_SUCCESS)
+        {
+            SWSS_LOG_ERROR("Failed to set fec override %d to port pid:%" PRIx64, attr.value.booldata, port.m_port_id);
+            task_process_status handle_status = handleSaiSetStatus(SAI_API_PORT, status);
+            if (handle_status != task_success)
+            {
+                return parseHandleSaiStatusFailure(handle_status);
+            }
+        }
+
+        SWSS_LOG_INFO("Set fec override %d to port pid:%" PRIx64, attr.value.booldata, port.m_port_id);
+    }
     setGearboxPortsAttr(port, SAI_PORT_ATTR_FEC_MODE, &fec_mode);
 
     SWSS_LOG_NOTICE("Set port %s FEC mode %d", port.m_alias.c_str(), fec_mode);
@@ -2524,6 +2554,18 @@ bool PortsOrch::setGearboxPortAttr(const Port &port, dest_port_type_t port_type,
                     m_gearboxTable->hset(key, speed_attr, to_string(speed));
                     SWSS_LOG_NOTICE("BOX: Updated APPL_DB key:%s %s %d", key.c_str(), speed_attr.c_str(), speed);
                 }
+                else if (id == SAI_PORT_ATTR_FEC_MODE && fec_override_sup)
+                {
+                    attr.id = SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE;
+                    attr.value.booldata = true;
+
+                    status = sai_port_api->set_port_attribute(dest_port_id, &attr);
+                    if (status != SAI_STATUS_SUCCESS)
+                    {
+                        SWSS_LOG_ERROR("BOX: Failed to set %s port fec override %d",
+                                       port.m_alias.c_str(), attr.value.booldata);
+                    }
+                }
             }
             else
             {

orchagent/portsorch.h

@@ -322,6 +322,7 @@ class PortsOrch : public Orch, public Subject
     map<string, uint32_t> m_bridge_port_ref_count;
 
     NotificationConsumer* m_portStatusNotificationConsumer;
+    bool fec_override_sup = false;
 
     swss::SelectableTimer *m_port_state_poller = nullptr;
 

tests/test_port_fec_override.py

@@ -0,0 +1,30 @@
+import time
+import os
+import pytest
+
+from swsscommon import swsscommon
+
+DVS_ENV = ["HWSKU=Mellanox-SN2700"]
+
+class TestPort(object):
+    def test_PortFecOverride(self, dvs, testlog):
+        db = swsscommon.DBConnector(0, dvs.redis_sock, 0)
+        adb = dvs.get_asic_db()
+
+        ptbl = swsscommon.ProducerStateTable(db, "PORT_TABLE")
+
+        # set fec
+        fvs = swsscommon.FieldValuePairs([("fec","rs")])
+        ptbl.set("Ethernet4", fvs)
+
+        # validate if fec rs is pushed to asic db when set first time
+        port_oid = adb.port_name_map["Ethernet4"]
+        expected_fields = {"SAI_PORT_ATTR_FEC_MODE":"SAI_PORT_FEC_MODE_RS", "SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE":"true"}
+        adb.wait_for_field_match("ASIC_STATE:SAI_OBJECT_TYPE_PORT", port_oid, expected_fields)
+
+
+# Add Dummy always-pass test at end as workaroud
+# for issue when Flaky fail on final test it invokes module tear-down before retrying
+def test_nonflaky_dummy():
+    pass
+