From 6bc2bdae62e156c6c5cb04b3e92b7c7fc912f41b Mon Sep 17 00:00:00 2001
From: Andriy Kokhan <andriyx.kokhan@intel.com>
Date: Tue, 20 Sep 2022 03:32:55 -0700
Subject: [PATCH] Added LAG member check on addLagMember()

Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com>
---
 cfgmgr/teammgr.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/cfgmgr/teammgr.cpp b/cfgmgr/teammgr.cpp
index 273674fbee..40eca9d921 100644
--- a/cfgmgr/teammgr.cpp
+++ b/cfgmgr/teammgr.cpp
@@ -716,6 +716,17 @@ task_process_status TeamMgr::addLagMember(const string &lag, const string &membe
 {
     SWSS_LOG_ENTER();
 
+    stringstream cmd;
+    string res;
+
+    // If port was already deleted, ignore this operation
+    cmd << IP_CMD << " link show " << shellquote(member);
+    if (exec(cmd.str(), res) != 0)
+    {
+	SWSS_LOG_WARN("Unable to find port %s", member.c_str());
+	return task_ignore;
+    }
+
     // If port is already enslaved, ignore this operation
     // TODO: check the current master if it is the same as to be configured
     if (isPortEnslaved(member))
@@ -723,9 +734,9 @@ task_process_status TeamMgr::addLagMember(const string &lag, const string &membe
         return task_ignore;
     }
 
-    stringstream cmd;
-    string res;
     uint16_t keyId = generateLacpKey(lag);
+    cmd.str("");
+    cmd.clear();
 
     // Set admin down LAG member (required by teamd) and enslave it
     // ip link set dev <member> down;