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/IgmpManager.java

diff --git a/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
index f70dde2..133ff18 100644
--- a/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
+++ b/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
@@ -240,7 +240,7 @@
         appId = coreService.registerApplication(APP_NAME);
         coreAppId = coreService.registerApplication(CoreService.CORE_APP_NAME);
         packetService.addProcessor(processor, PacketProcessor.director(4));
-        IgmpSender.init(packetService, igmpLeadershipService, igmpStatisticsManager);
+        IgmpSender.init(packetService, igmpStatisticsManager);
 
         networkConfig.registerConfigFactory(igmpproxySsmConfigFactory);
         networkConfig.registerConfigFactory(igmpproxyConfigFactory);
@@ -1051,7 +1051,11 @@
                         if (vlanConfigChanged || innerVlanConfigChanged) {
                             log.info("igmpproxy vlan config received. {}", config);
                             //at least one of the vlan configs has changed. Call leave before setting new values
-                            groupMemberStore.getAllGroupMembers().forEach(m -> leaveAction(m));
+                            groupMemberStore.getAllGroupMembers().forEach(m -> {
+                                if (igmpLeadershipService.isLocalLeader(m.getDeviceId())) {
+                                    leaveAction(m);
+                                }
+                            });
                             if (vlanConfigChanged) {
                                 mvlan = config.egressVlan().toShort();
                                 IgmpSender.getInstance().setMvlan(mvlan);