commit 2114e5d78d7e50a46eb90c72809cfd0ba2f4963b
author Jonathan Hart <jonomhart@gmail.com> Mon Apr 27 11:03:10 2020 -0700
committer Jonathan Hart <jonomhart@gmail.com> Mon Apr 27 11:03:10 2020 -0700
tree bc9fdce7006a2023e30b1c17b37f08b96e7e5ba9
parent aadf17a98bf3a84bf38ac7fef0dfea27e80ff143

Remove mastership checks for NNI flows.

These are done earlier in the Olt service.

Change-Id: If5de2ddd0039dc9e2a179bc21792581b1d8256b1

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

diff --git a/app/src/main/java/org/opencord/olt/impl/OltFlowService.java b/app/src/main/java/org/opencord/olt/impl/OltFlowService.java
index 09746cc..3d41a5b 100644
--- a/app/src/main/java/org/opencord/olt/impl/OltFlowService.java
+++ b/app/src/main/java/org/opencord/olt/impl/OltFlowService.java
@@ -219,10 +219,6 @@
             return;
         }
 
-        if (!mastershipService.isLocalMaster(devId)) {
-            return;
-        }
-
         int techProfileId = tagInformation != null ? tagInformation.getTechnologyProfileId() : NONE_TP_ID;
         VlanId cTag = tagInformation != null ? tagInformation.getPonCTag() : VlanId.NONE;
         VlanId unitagMatch = tagInformation != null ? tagInformation.getUniTagMatch() : VlanId.ANY;
@@ -312,10 +308,6 @@
             return;
         }
 
-        if (!mastershipService.isLocalMaster(devId)) {
-            return;
-        }
-
         DefaultFilteringObjective.Builder builder = DefaultFilteringObjective.builder();
         TrafficTreatment.Builder treatmentBuilder = DefaultTrafficTreatment.builder();
         if (upstream) {
@@ -496,9 +488,6 @@
 
     @Override
     public void processLldpFilteringObjective(DeviceId devId, PortNumber port, boolean install) {
-        if (!mastershipService.isLocalMaster(devId)) {
-            return;
-        }
         DefaultFilteringObjective.Builder builder = DefaultFilteringObjective.builder();
 
         FilteringObjective lldp = (install ? builder.permit() : builder.deny())