Add feature check

Signed-off-by: Ze Gan <ganze718@gmail.com>
sonic-net · May 25, 2022 · 2755b22 · 2755b22
1 parent b26b305
commit 2755b22
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 5 deletions.
diff --git a/cfgmgr/teammgr.cpp b/cfgmgr/teammgr.cpp
@@ -34,7 +34,8 @@ TeamMgr::TeamMgr(DBConnector *confDb, DBConnector *applDb, DBConnector *statDb,
     m_appLagTable(applDb, APP_LAG_TABLE_NAME),
     m_statePortTable(statDb, STATE_PORT_TABLE_NAME),
     m_stateLagTable(statDb, STATE_LAG_TABLE_NAME),
-    m_stateMACsecPortTable(statDb, STATE_MACSEC_PORT_TABLE_NAME)
+    m_stateMACsecPortTable(statDb, STATE_MACSEC_PORT_TABLE_NAME),
+    m_stateFeatureTable(statDb, "FEATURE")
 {
     SWSS_LOG_ENTER();
 
@@ -99,6 +100,27 @@ bool TeamMgr::isLagStateOk(const string &alias)
     return true;
 }
 
+bool TeamMgr::isMACsecFeatureEnabled()
+{
+    SWSS_LOG_ENTER();
+
+    vector<FieldValueTuple> temp;
+    if (!m_stateFeatureTable.get("macsec", temp))
+    {
+        return false;
+    }
+
+    auto opt = swss::fvsGetValue(temp, "state", true);
+
+    if (!opt || *opt != "enabled")
+    {
+        SWSS_LOG_INFO("MACsec feature isn't enabled");
+        return false;
+    }
+
+    return true;
+}
+
 bool TeamMgr::isMACsecSetted(const std::string &port)
 {
     SWSS_LOG_ENTER();
@@ -348,10 +370,13 @@ void TeamMgr::doLagMemberTask(Consumer &consumer)
                 continue;
             }
 
-            if (isMACsecSetted(member) && !isMACsecStateOk(member))
+            if (isMACsecFeatureEnabled())
             {
-                it++;
-                continue;
+                if (isMACsecSetted(member) && !isMACsecStateOk(member))
+                {
+                    it++;
+                    continue;
+                }
             }
 
             if (addLagMember(lag, member) == task_need_retry)

diff --git a/tests/test_macsec.py b/tests/test_macsec.py
@@ -765,7 +765,8 @@ def test_macsec_attribute_change(self, dvs: conftest.DockerVirtualSwitch, testlo
     def test_macsec_with_portchannel(self, dvs: conftest.DockerVirtualSwitch, testlog):
 
         # Set MACsec enabled on Ethernet0
-        ConfigTable(dvs, "PORT")["Ethernet0"] = {"macsec": "test"}
+        ConfigTable(dvs, "PORT")["Ethernet0"] = {"macsec" : "test"}
+        StateDBTable(dvs, "FEATURE")["macsec"] = {"state": "enabled"}
 
         # Setup Port-channel
         ConfigTable(dvs, "PORTCHANNEL")["PortChannel001"] = {"admin": "up", "mtu": "9100", "oper_status": "up"}
@@ -831,6 +832,15 @@ def test_macsec_with_portchannel(self, dvs: conftest.DockerVirtualSwitch, testlo
             macsec_port_identifier,
             0)
 
+        # remove port channel member
+        del ConfigTable(dvs, "PORTCHANNEL_INTERFACE")["PortChannel001"]
+        del ConfigTable(dvs, "PORTCHANNEL_INTERFACE")["PortChannel001|40.0.0.0/31"]
+        del ConfigTable(dvs, "PORTCHANNEL_MEMBER")["PortChannel001|Ethernet0"]
+
+        # remove port channel
+        del ConfigTable(dvs, "PORTCHANNEL")["PortChannel001"]
+
+
 # Add Dummy always-pass test at end as workaroud
 # for issue when Flaky fail on final test it invokes module tear-down
 # before retrying