commit d1957c914e4bd2c62e50d9e59f1626047d58f176
author Vignesh Ethiraj <vignesh.ethiraj@infosys.com> Mon Nov 18 11:52:49 2019 +0000
committer pier <pier@opennetworking.org> Mon Dec 23 19:02:56 2019 +0100
tree 6a144dcf80143892f125fd8d46eb95d2b8b32139
parent a05342ed5b033692f81fb72ba520e0263f4ecf41

[SEBA-862] Unit test for SEBA-644 igmpproxy should forward IGMP to BNG on a per pod basis or a per OLT basis

Change-Id: Iec1b99be97f1d916cc640db75ca84eec7bce7cc4

src/main/java/org/opencord/igmpproxy/IgmpManager.java

diff --git a/src/main/java/org/opencord/igmpproxy/IgmpManager.java b/src/main/java/org/opencord/igmpproxy/IgmpManager.java
index 691e58f..7c5bfaf 100644
--- a/src/main/java/org/opencord/igmpproxy/IgmpManager.java
+++ b/src/main/java/org/opencord/igmpproxy/IgmpManager.java
@@ -232,7 +232,7 @@
             IgmpSender.getInstance().setMvlan(mvlan);
         }
         deviceService.addListener(deviceListener);
-        scheduledExecutorService.scheduleAtFixedRate(new IgmpProxyTimerTask(), 0, 1000, TimeUnit.MILLISECONDS);
+        scheduledExecutorService.scheduleAtFixedRate(new IgmpProxyTimerTask(), 1000, 1000, TimeUnit.MILLISECONDS);
         eventExecutor = newSingleThreadScheduledExecutor(groupedThreads("cord/igmpproxy",
                                                                         "events-igmp-%d", log));
 
@@ -474,7 +474,6 @@
                     log.error("Device not registered in netcfg :" + deviceId.toString());
                     return;
                 }
-
                 IGMP igmp = (IGMP) ipv4Pkt.getPayload();
                 switch (igmp.getIgmpType()) {
                     case IGMP.TYPE_IGMPV3_MEMBERSHIP_QUERY:

src/main/java/org/opencord/igmpproxy/SingleStateMachine.java

diff --git a/src/main/java/org/opencord/igmpproxy/SingleStateMachine.java b/src/main/java/org/opencord/igmpproxy/SingleStateMachine.java
index 657b683..c5aaee7 100644
--- a/src/main/java/org/opencord/igmpproxy/SingleStateMachine.java
+++ b/src/main/java/org/opencord/igmpproxy/SingleStateMachine.java
@@ -27,6 +27,9 @@
  * RFC 2236 "6. Host State Diagram".
  */
 public class SingleStateMachine {
+    // Only for tests purposes
+    static boolean sendQuery = true;
+
     static final int STATE_NON = 0;
     static final int STATE_DELAY = 1;
     static final int STATE_IDLE = 2;
@@ -166,9 +169,11 @@
         }
 
         public void timeOut() {
-            Ethernet eth = IgmpSender.getInstance().buildIgmpV3ResponseQuery(groupIp, srcIp);
-            IgmpSender.getInstance().sendIgmpPacketUplink(eth, devId);
-            timeOut = DEFAULT_MAX_RESP;
+            if (sendQuery) {
+                Ethernet eth = IgmpSender.getInstance().buildIgmpV3ResponseQuery(groupIp, srcIp);
+                IgmpSender.getInstance().sendIgmpPacketUplink(eth, devId);
+                timeOut = DEFAULT_MAX_RESP;
+            }
         }
 
     }