commit 4a9075daa157fc6f1bf20d76d3da68606a09fbbe
author Esin Karaman <esin.karaman@netsia.com> Tue Jul 14 14:46:14 2020 +0000
committer Esin Karaman <esin.karaman@netsia.com> Thu Jul 16 13:00:05 2020 +0300
tree fd21e1f1c3c0dcab03ccb47e7cf942311240e547
parent e41bdc52e60b6a040615d59dbc746361af9f1cdc

VOL-3343  In connect point mode, IgmpProxy cannot packet-out to the agg.device in slave mode

Change-Id: I6e4a3304a7ee04e101f611c8ebea1e47935c7a30

app/src/main/java/org/opencord/igmpproxy/impl/IgmpSender.java

diff --git a/app/src/main/java/org/opencord/igmpproxy/impl/IgmpSender.java b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpSender.java
index c71c70a..79aa80e 100644
--- a/app/src/main/java/org/opencord/igmpproxy/impl/IgmpSender.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpSender.java
@@ -65,16 +65,13 @@
     private int maxResp = DEFAULT_MEX_RESP;
     private Logger log = LoggerFactory.getLogger(getClass());
 
-    private IgmpSender(PacketService packetService, IgmpLeadershipService igmpLeadershipService,
-             IgmpStatisticsService igmpStatisticsService) {
+    private IgmpSender(PacketService packetService, IgmpStatisticsService igmpStatisticsService) {
         this.packetService = packetService;
-        this.igmpLeadershipService = igmpLeadershipService;
         this.igmpStatisticsService = igmpStatisticsService;
     }
 
-    public static void init(PacketService packetService, IgmpLeadershipService igmpLeadershipService,
-            IgmpStatisticsService igmpStatisticsService) {
-        instance = new IgmpSender(packetService, igmpLeadershipService, igmpStatisticsService);
+    public static void init(PacketService packetService, IgmpStatisticsService igmpStatisticsService) {
+        instance = new IgmpSender(packetService, igmpStatisticsService);
     }
 
     public static IgmpSender getInstance() {
@@ -254,10 +251,6 @@
     }
 
     public void sendIgmpPacketUplink(Ethernet ethPkt, DeviceId deviceId, PortNumber upLinkPort) {
-        if (!igmpLeadershipService.isLocalLeader(deviceId)) {
-            return;
-        }
-
         if (IgmpManager.connectPointMode) {
             if (IgmpManager.connectPoint == null) {
                 log.warn("cannot find a connectPoint to send the packet uplink");
@@ -270,12 +263,6 @@
     }
 
     public void sendIgmpPacket(Ethernet ethPkt, DeviceId deviceId, PortNumber portNumber) {
-        if (!igmpLeadershipService.isLocalLeader(deviceId)) {
-            log.trace("Instance is not leader for device {}, " +
-                             "not emitting IMGP packet on port {}", deviceId, portNumber);
-            return;
-        }
-
         if (log.isTraceEnabled()) {
             log.trace("Emitting on {}/{} outbound IGMP packet {}", deviceId, portNumber, ethPkt);
         }