From 7280e19450fc65195a28d72f19bb4f1a11c1c510 Mon Sep 17 00:00:00 2001
From: Alexander Allen <arallen@nvidia.com>
Date: Wed, 11 Aug 2021 06:01:23 -0700
Subject: [PATCH] [orchagent][ports] Add port reference increment / decrement
 to lag member add / remove flows (#1825)

* Added code to increment the port reference counter on the creation of a lag membership that involves that port. Also added code to decrement the counter on the removal of that lag membership as well. This prevents the port from being removed before the lag membership is.
---
 orchagent/portsorch.cpp    |  5 ++++
 tests/test_port_dpb_lag.py | 61 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 tests/test_port_dpb_lag.py

diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
index bf8b1ed557f5..f2ffbd6231c9 100755
--- a/orchagent/portsorch.cpp
+++ b/orchagent/portsorch.cpp
@@ -4812,6 +4812,8 @@ bool PortsOrch::addLagMember(Port &lag, Port &port, bool enableForwarding)
         }
     }
 
+    increasePortRefCount(port.m_alias);
+
     LagMemberUpdate update = { lag, port, true };
     notify(SUBJECT_TYPE_LAG_MEMBER_CHANGE, static_cast<void *>(&update));
 
@@ -4857,6 +4859,9 @@ bool PortsOrch::removeLagMember(Port &lag, Port &port)
             return false;
         }
     }
+
+    decreasePortRefCount(port.m_alias);
+
     LagMemberUpdate update = { lag, port, false };
     notify(SUBJECT_TYPE_LAG_MEMBER_CHANGE, static_cast<void *>(&update));
 
diff --git a/tests/test_port_dpb_lag.py b/tests/test_port_dpb_lag.py
new file mode 100644
index 000000000000..44eddf4641fa
--- /dev/null
+++ b/tests/test_port_dpb_lag.py
@@ -0,0 +1,61 @@
+import time
+import pytest
+from port_dpb import Port
+from port_dpb import DPB
+
+@pytest.mark.usefixtures('dpb_setup_fixture')
+@pytest.mark.usefixtures('dvs_lag_manager')
+class TestPortDPBLag(object):
+    def check_syslog(self, dvs, marker, log, expected_cnt):
+        (exitcode, num) = dvs.runcmd(['sh', '-c', "awk \'/%s/,ENDFILE {print;}\' /var/log/syslog | grep \"%s\" | wc -l" % (marker, log)])
+        assert num.strip() >= str(expected_cnt)
+
+    def test_dependency(self, dvs):
+        lag = "0001"
+        p = Port(dvs, "Ethernet0")
+        p.sync_from_config_db()
+
+        # 1. Create PortChannel0001.
+        self.dvs_lag.create_port_channel(lag)
+
+        # 2. Add Ethernet0 to PortChannel0001.
+        self.dvs_lag.create_port_channel_member(lag, p.get_name())
+        time.sleep(2)
+
+        # 3. Add log marker to syslog
+        marker = dvs.add_log_marker()
+
+        # 4. Delete Ethernet0 from config DB.
+        p.delete_from_config_db()
+        time.sleep(2)
+
+        # 5. Verify that we are waiting in portsorch for the port
+        #    to be removed from LAG, by looking at the log
+        self.check_syslog(dvs, marker, "Unable to remove port Ethernet0: ref count 1", 1)
+
+        # 6. Also verify that port is still present in ASIC DB.
+        assert(p.exists_in_asic_db() == True)
+
+        # 7. Remove port from LAG
+        self.dvs_lag.remove_port_channel_member(lag, p.get_name())
+
+        # 8. Verify that port is removed from ASIC DB
+        assert(p.not_exists_in_asic_db() == True)
+
+        # 9. Re-create port Ethernet0 and verify that it is
+        #    present in CONFIG, APPL, and ASIC DBs
+        p.write_to_config_db()
+        p.verify_config_db()
+        p.verify_app_db()
+        p.verify_asic_db()
+
+        # 10. Remove PortChannel0001 and verify that its removed.
+        self.dvs_lag.remove_port_channel(lag)        
+        time.sleep(30)
+        self.dvs_lag.get_and_verify_port_channel(0)
+
+
+# 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