Avoid adding loopback interface (ip link add) when setting nat zone o…

…n loopback interface (sonic-net#1434) Signed-off-by: Akhilesh Samineni <[email protected]>
raphaelt-nvidia · Sep 17, 2020 · 40ff871 · 40ff871
1 parent 4aa48d6
commit 40ff871
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cfgmgr/intfmgr.cpp b/cfgmgr/intfmgr.cpp
@@ -495,7 +495,12 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
 
         if (is_lo)
         {
-            addLoopbackIntf(alias);
+            if (m_loopbackIntfList.find(alias) == m_loopbackIntfList.end())
+            {
+                addLoopbackIntf(alias);
+                m_loopbackIntfList.insert(alias);
+                SWSS_LOG_INFO("Added %s loopback interface", alias.c_str());
+            }
         }
         else
         {
@@ -598,6 +603,7 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
         if (is_lo)
         {
             delLoopbackIntf(alias);
+            m_loopbackIntfList.erase(alias);
         }
 
         if (!subIntfAlias.empty())

diff --git a/cfgmgr/intfmgr.h b/cfgmgr/intfmgr.h
@@ -22,6 +22,7 @@ class IntfMgr : public Orch
     Table m_statePortTable, m_stateLagTable, m_stateVlanTable, m_stateVrfTable, m_stateIntfTable;
 
     std::set<std::string> m_subIntfList;
+    std::set<std::string> m_loopbackIntfList;
 
     void setIntfIp(const std::string &alias, const std::string &opCmd, const IpPrefix &ipPrefix);
     void setIntfVrf(const std::string &alias, const std::string &vrfName);