commit 49c4205a095c0afd50dbed45d1d52c5db51b8c4b
author Matteo Scandolo <matteo.scandolo@gmail.com> Tue Nov 23 13:12:29 2021 -0800
committer Matteo Scandolo <matteo.scandolo@gmail.com> Wed Nov 24 08:04:47 2021 -0800
tree 6c4bfcae2af59ddb3c7c43ed231b736af7b7d52b
parent 88df8aed75a17ac17818467e5f69e428130c935a

Avoid creating default EAPOL on port removed event

Change-Id: If15f846d6a4c4463b5a0d4e7d4b3abb390aed1ab

impl/src/main/java/org/opencord/olt/impl/OltFlowService.java

diff --git a/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java b/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
index 28a0f53..cbc538a 100644
--- a/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
+++ b/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
@@ -581,8 +581,9 @@
             // remove the tagged eapol
             handleSubscriberEapolFlows(sub, FlowOperation.REMOVE, si);
 
-            // and add the default one back
-            if (sub.port.isEnabled()) {
+            // and add the default one back (only if the port is ENABLED and still present on the device)
+            if (sub.port.isEnabled() && deviceService.getPort(sub.device.id(), sub.port.number()) != null) {
+
                 // NOTE we remove the subscriber when the port goes down
                 // but in that case we don't need to add default eapol
                 handleEapolFlow(sub, defaultBandwithProfile, defaultBandwithProfile,