[SEBA-41] Operational Status IGMP Data
Change-Id: I8e3d9bdfafe61d7d357dc1fae8735ed78b9a77eb
diff --git a/src/test/java/org/opencord/igmpproxy/IgmpManagerBase.java b/src/test/java/org/opencord/igmpproxy/IgmpManagerBase.java
index 43cc24a..05581ed 100644
--- a/src/test/java/org/opencord/igmpproxy/IgmpManagerBase.java
+++ b/src/test/java/org/opencord/igmpproxy/IgmpManagerBase.java
@@ -20,7 +20,13 @@
import org.onlab.packet.Ip4Address;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
+import org.onosproject.cfg.ComponentConfigService;
+import org.onosproject.cfg.ConfigProperty;
import org.onosproject.core.ApplicationId;
+import org.onosproject.event.DefaultEventSinkRegistry;
+import org.onosproject.event.Event;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.event.EventSink;
import org.onosproject.mastership.MastershipServiceAdapter;
import org.onosproject.mcast.api.McastListener;
import org.onosproject.mcast.api.McastRoute;
@@ -57,9 +63,18 @@
import org.opencord.sadis.SubscriberAndDeviceInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.ComponentInstance;
+
+import static com.google.common.base.Preconditions.checkState;
import java.nio.ByteBuffer;
import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -92,6 +107,8 @@
protected static final String CLIENT_CIRCUIT_ID = "CIR-PON 1/1";
protected String dsBpId = "HSIA-DS";
+ private static final int STATISTICS_GEN_PERIOD_IN_SEC = 2;
+
private static final String NNI_PREFIX = "nni";
protected List<Port> lsPorts = new ArrayList<Port>();
@@ -191,6 +208,7 @@
class TestNetworkConfigRegistry extends NetworkConfigRegistryAdapter {
Boolean igmpOnPodFlag = false;
+
TestNetworkConfigRegistry(Boolean igmpFlag) {
igmpOnPodFlag = igmpFlag;
}
@@ -377,28 +395,36 @@
}
/**
- * Sends an Ethernet packet to the process method of the Packet Processor.
+ * Sends Ethernet packet to the process method of the Packet Processor.
*
* @param reply Ethernet packet
* @throws InterruptedException
*/
- void sendPacket(Ethernet reply) {
+ void sendPacket(Ethernet reply, boolean isSingleSend) {
final ByteBuffer byteBuffer = ByteBuffer.wrap(reply.serialize());
- if (flagForPacket) {
- InboundPacket inPacket = new DefaultInboundPacket(CONNECT_POINT_A, reply, byteBuffer);
- context = new TestPacketContext(127L, inPacket, null, false);
- flagForPacket = false;
+ if (isSingleSend) {
+ InboundPacket inBoundPacket = new DefaultInboundPacket(CONNECT_POINT_B, reply, byteBuffer);
+ context = new TestPacketContext(127L, inBoundPacket, null, false);
packetProcessor.process(context);
} else {
- InboundPacket inBoundPacket = new DefaultInboundPacket(CONNECT_POINT_B, reply, byteBuffer);
- context = new TestPacketContext(127L, inBoundPacket, null, false);
- flagForPacket = true;
+ if (flagForPacket) {
+ InboundPacket inPacket = new DefaultInboundPacket(CONNECT_POINT_A, reply, byteBuffer);
+ context = new TestPacketContext(127L, inPacket, null, false);
+ flagForPacket = false;
- packetProcessor.process(context);
+ packetProcessor.process(context);
+ } else {
+ InboundPacket inBoundPacket = new DefaultInboundPacket(CONNECT_POINT_B, reply, byteBuffer);
+ context = new TestPacketContext(127L, inBoundPacket, null, false);
+ flagForPacket = true;
+
+ packetProcessor.process(context);
+ }
}
+
}
protected class MockSadisService implements SadisService {
@@ -484,4 +510,134 @@
}
}
+ protected class MockCfgService implements ComponentConfigService {
+
+ @Override
+ public Set<String> getComponentNames() {
+ return null;
+ }
+
+ @Override
+ public void registerProperties(Class<?> componentClass) {
+
+ }
+
+ @Override
+ public void unregisterProperties(Class<?> componentClass, boolean clear) {
+
+ }
+
+ @Override
+ public Set<ConfigProperty> getProperties(String componentName) {
+ return null;
+ }
+
+ @Override
+ public void setProperty(String componentName, String name, String value) {
+
+ }
+
+ @Override
+ public void preSetProperty(String componentName, String name, String value) {
+
+ }
+
+ @Override
+ public void preSetProperty(String componentName, String name, String value, boolean override) {
+
+ }
+
+ @Override
+ public void unsetProperty(String componentName, String name) {
+
+ }
+
+ @Override
+ public ConfigProperty getProperty(String componentName, String attribute) {
+ return null;
+ }
+
+ }
+
+ public static class TestEventDispatcher extends DefaultEventSinkRegistry implements EventDeliveryService {
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public synchronized void post(Event event) {
+ EventSink sink = getSink(event.getClass());
+ checkState(sink != null, "No sink for event %s", event);
+ sink.process(event);
+ }
+
+ @Override
+ public void setDispatchTimeLimit(long millis) {
+ }
+
+ @Override
+ public long getDispatchTimeLimit() {
+ return 0;
+ }
+ }
+
+ class MockComponentContext implements ComponentContext {
+
+ @Override
+ public Dictionary<String, Object> getProperties() {
+ Dictionary<String, Object> cfgDict = new Hashtable<String, Object>();
+ cfgDict.put("statisticsGenerationPeriodInSeconds", STATISTICS_GEN_PERIOD_IN_SEC);
+ return cfgDict;
+ }
+
+ @Override
+ public Object locateService(String name) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Object locateService(String name, ServiceReference reference) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Object[] locateServices(String name) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public BundleContext getBundleContext() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Bundle getUsingBundle() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public ComponentInstance getComponentInstance() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void enableComponent(String name) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ public void disableComponent(String name) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ public ServiceReference getServiceReference() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ }
}
diff --git a/src/test/java/org/opencord/igmpproxy/IgmpManagerTest.java b/src/test/java/org/opencord/igmpproxy/IgmpManagerTest.java
index 21a83fe..b77a09c 100644
--- a/src/test/java/org/opencord/igmpproxy/IgmpManagerTest.java
+++ b/src/test/java/org/opencord/igmpproxy/IgmpManagerTest.java
@@ -18,19 +18,26 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.onlab.junit.TestUtils;
import org.onlab.packet.Ethernet;
import org.onosproject.core.CoreServiceAdapter;
import org.onosproject.net.flow.FlowRuleServiceAdapter;
import org.onosproject.net.flowobjective.FlowObjectiveServiceAdapter;
+import org.opencord.igmpproxy.IgmpManagerBase.MockComponentContext;
import static org.junit.Assert.*;
+/**
+ * Set of tests of the ONOS application component.
+ */
public class IgmpManagerTest extends IgmpManagerBase {
private static final int WAIT_TIMEOUT = 1000;
private IgmpManager igmpManager;
+ private IgmpStatisticsManager igmpStatisticsManager;
+
// Set up the IGMP application.
@Before
public void setUp() {
@@ -43,6 +50,11 @@
igmpManager.flowRuleService = new FlowRuleServiceAdapter();
igmpManager.multicastService = new TestMulticastRouteService();
igmpManager.sadisService = new MockSadisService();
+ igmpStatisticsManager = new IgmpStatisticsManager();
+ igmpStatisticsManager.cfgService = new MockCfgService();
+ TestUtils.setField(igmpStatisticsManager, "eventDispatcher", new TestEventDispatcher());
+ igmpStatisticsManager.activate(new MockComponentContext());
+ igmpManager.igmpStatisticsManager = this.igmpStatisticsManager;
// By default - we send query messages
SingleStateMachine.sendQuery = true;
}
@@ -84,16 +96,17 @@
Ethernet firstPacket = IgmpSender.getInstance().buildIgmpV3Join(GROUP_IP, SOURCE_IP_OF_A);
Ethernet secondPacket = IgmpSender.getInstance().buildIgmpV3Join(GROUP_IP, SOURCE_IP_OF_B);
// Sending first packet and here shouldSendjoin flag will be true
- sendPacket(firstPacket);
+ sendPacket(firstPacket, false);
// Emitted packet is stored in list savedPackets
assertNotNull(savedPackets);
synchronized (savedPackets) {
savedPackets.wait(WAIT_TIMEOUT);
}
+
assertNotNull(savedPackets);
assertEquals(1, savedPackets.size());
// Sending the second packet with same group ip address
- sendPacket(secondPacket);
+ sendPacket(secondPacket, false);
synchronized (savedPackets) {
savedPackets.wait(WAIT_TIMEOUT);
}
@@ -113,7 +126,7 @@
Ethernet firstPacket = IgmpSender.getInstance().buildIgmpV3Join(GROUP_IP, SOURCE_IP_OF_A);
Ethernet secondPacket = IgmpSender.getInstance().buildIgmpV3Join(GROUP_IP, SOURCE_IP_OF_B);
// Sending first packet and here shouldSendjoin flag will be true
- sendPacket(firstPacket);
+ sendPacket(firstPacket, false);
// Emitted packet is stored in list savedPackets
synchronized (savedPackets) {
savedPackets.wait(WAIT_TIMEOUT);
@@ -122,10 +135,11 @@
assertEquals(1, savedPackets.size());
// Sending the second packet with same group ip address which will not be emitted
// shouldSendJoin flag will be false.
- sendPacket(secondPacket);
+ sendPacket(secondPacket, false);
synchronized (savedPackets) {
savedPackets.wait(WAIT_TIMEOUT);
}
assertEquals(1, savedPackets.size());
}
+
}
diff --git a/src/test/java/org/opencord/igmpproxy/IgmpStatisticsTest.java b/src/test/java/org/opencord/igmpproxy/IgmpStatisticsTest.java
new file mode 100644
index 0000000..e1e4f35
--- /dev/null
+++ b/src/test/java/org/opencord/igmpproxy/IgmpStatisticsTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.opencord.igmpproxy;
+
+import static org.junit.Assert.assertEquals;
+import static org.onlab.junit.TestTools.assertAfter;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.junit.TestUtils;
+import org.onlab.packet.Ethernet;
+import org.onosproject.core.CoreServiceAdapter;
+import org.onosproject.net.flow.FlowRuleServiceAdapter;
+import org.onosproject.net.flowobjective.FlowObjectiveServiceAdapter;
+
+import com.google.common.collect.Lists;
+
+/**
+ * Set of tests of the ONOS application component for IGMP Statistics.
+ */
+public class IgmpStatisticsTest extends IgmpManagerBase {
+
+ private static final int WAIT_TIMEOUT = 500;
+
+ private IgmpManager igmpManager;
+
+ private IgmpStatisticsManager igmpStatisticsManager;
+
+ private MockIgmpStatisticsEventListener mockListener = new MockIgmpStatisticsEventListener();
+
+ // Set up the IGMP application.
+ @Before
+ public void setUp() {
+ igmpManager = new IgmpManager();
+ igmpManager.coreService = new CoreServiceAdapter();
+ igmpManager.mastershipService = new MockMastershipService();
+ igmpManager.flowObjectiveService = new FlowObjectiveServiceAdapter();
+ igmpManager.deviceService = new MockDeviceService();
+ igmpManager.packetService = new MockPacketService();
+ igmpManager.flowRuleService = new FlowRuleServiceAdapter();
+ igmpManager.multicastService = new TestMulticastRouteService();
+ igmpManager.sadisService = new MockSadisService();
+ igmpStatisticsManager = new IgmpStatisticsManager();
+ igmpStatisticsManager.cfgService = new MockCfgService();
+ igmpStatisticsManager.addListener(mockListener);
+ TestUtils.setField(igmpStatisticsManager, "eventDispatcher", new TestEventDispatcher());
+ igmpStatisticsManager.activate(new MockComponentContext());
+ igmpManager.igmpStatisticsManager = this.igmpStatisticsManager;
+ // By default - we send query messages
+ SingleStateMachine.sendQuery = true;
+ }
+
+ // Tear Down the IGMP application.
+ @After
+ public void tearDown() {
+ igmpStatisticsManager.removeListener(mockListener);
+ igmpStatisticsManager.deactivate();
+ IgmpManager.groupMemberMap.clear();
+ StateMachine.clearMap();
+ }
+
+ //Test Igmp Statistics.
+ @Test
+ public void testIgmpStatistics() throws InterruptedException {
+ igmpManager.networkConfig = new TestNetworkConfigRegistry(false);
+ igmpManager.activate();
+ //IGMPv3 Join
+ Ethernet igmpv3MembershipReportPkt = IgmpSender.getInstance().buildIgmpV3Join(GROUP_IP, SOURCE_IP_OF_A);
+ sendPacket(igmpv3MembershipReportPkt, true);
+ synchronized (savedPackets) {
+ savedPackets.wait(WAIT_TIMEOUT);
+ }
+ //Leave
+ Ethernet igmpv3LeavePkt = IgmpSender.getInstance().buildIgmpV3Leave(GROUP_IP, SOURCE_IP_OF_A);
+ sendPacket(igmpv3LeavePkt, true);
+ synchronized (savedPackets) {
+ savedPackets.wait(WAIT_TIMEOUT);
+ }
+
+ assertAfter(WAIT_TIMEOUT, WAIT_TIMEOUT * 2, () ->
+ assertEquals((long) 2, igmpStatisticsManager.getIgmpStats().getTotalMsgReceived().longValue()));
+ assertEquals((long) 1, igmpStatisticsManager.getIgmpStats().getIgmpJoinReq().longValue());
+ assertEquals((long) 2, igmpStatisticsManager.getIgmpStats().getIgmpv3MembershipReport().longValue());
+ assertEquals((long) 1, igmpStatisticsManager.getIgmpStats().getIgmpSuccessJoinRejoinReq().longValue());
+
+ assertEquals((long) 1, igmpStatisticsManager.getIgmpStats().getIgmpLeaveReq().longValue());
+ assertEquals((long) 2, igmpStatisticsManager.getIgmpStats().getIgmpMsgReceived().longValue());
+
+ }
+
+ //Test Events
+ @Test
+ public void testIgmpStatisticsEvent() {
+ final int waitEventGeneration = igmpStatisticsManager.statisticsGenerationPeriodInSeconds * 1000;
+ //assert that event listened as the app activates
+ assertAfter(WAIT_TIMEOUT, WAIT_TIMEOUT * 2, () ->
+ assertEquals(mockListener.events.size(), 1));
+
+ assertAfter(waitEventGeneration / 2, waitEventGeneration, () ->
+ assertEquals(mockListener.events.size(), 2));
+
+ for (IgmpStatisticsEvent event : mockListener.events) {
+ assertEquals(event.type(), IgmpStatisticsEvent.Type.STATS_UPDATE);
+ }
+ }
+
+ public class MockIgmpStatisticsEventListener implements IgmpStatisticsEventListener {
+ protected List<IgmpStatisticsEvent> events = Lists.newArrayList();
+
+ @Override
+ public void event(IgmpStatisticsEvent event) {
+ events.add(event);
+ }
+
+ }
+}