[SEBA-42] Operational Status Multicast Source
Change-Id: I420254a9a62d1ac9c9f4cab04fc2a44a81f2eb16
diff --git a/src/test/java/org/opencord/cordmcast/McastTest.java b/src/test/java/org/opencord/cordmcast/McastTest.java
index c8be3b2..c55544e 100644
--- a/src/test/java/org/opencord/cordmcast/McastTest.java
+++ b/src/test/java/org/opencord/cordmcast/McastTest.java
@@ -15,30 +15,25 @@
*/
package org.opencord.cordmcast;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Dictionary;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
+
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.onlab.junit.TestUtils;
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.VlanId;
+import org.onosproject.cfg.ComponentConfigAdapter;
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.mcast.api.McastEvent;
+import org.onosproject.mcast.api.McastRoute;
import org.onosproject.mcast.api.McastRouteUpdate;
import org.onosproject.mcast.api.MulticastRouteService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.HostId;
-import org.onosproject.net.config.NetworkConfigRegistryAdapter;
import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.flow.criteria.IPCriterion;
@@ -49,11 +44,24 @@
import org.osgi.service.component.ComponentContext;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
+
+import java.util.Dictionary;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Set;
+import java.util.Map;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.junit.Assert.*;
import static org.onlab.junit.TestTools.assertAfter;
public class McastTest extends McastTestBase {
private CordMcast cordMcast;
+ private CordMcastStatisticsManager cordMcastStatisticsManager;
+
+ private MockCordMcastStatisticsEventListener mockListener = new MockCordMcastStatisticsEventListener();
private static final int WAIT_TIMEOUT = 1000;
private static final int WAIT = 250;
@@ -62,35 +70,50 @@
@Before
public void setUp() {
cordMcast = new CordMcast();
+ cordMcastStatisticsManager = new CordMcastStatisticsManager();
cordMcast.coreService = new MockCoreService();
+ cordMcast.networkConfig = new TestNetworkConfigRegistry();
cordMcast.flowObjectiveService = new MockFlowObjectiveService();
cordMcast.mastershipService = new TestMastershipService();
cordMcast.deviceService = new MockDeviceService();
- cordMcast.networkConfig = new NetworkConfigRegistryAdapter();
+ cordMcast.componentConfigService = new ComponentConfigAdapter();
+ cordMcastStatisticsManager.componentConfigService = new ComponentConfigAdapter();
+ cordMcastStatisticsManager.addListener(mockListener);
cordMcast.sadisService = new MockSadisService();
+ cordMcast.cordMcastStatisticsService = cordMcastStatisticsManager;
- cordMcast.storageService =
- EasyMock.createMock(StorageServiceAdapter.class);
+ cordMcast.storageService = EasyMock.createMock(StorageServiceAdapter.class);
expect(cordMcast.storageService.consistentMapBuilder()).andReturn(new TestConsistentMap.Builder<>());
replay(cordMcast.storageService);
Dictionary<String, Object> cfgDict = new Hashtable<String, Object>();
cfgDict.put("vlanEnabled", false);
- cordMcast.componentConfigService =
- EasyMock.createNiceMock(ComponentConfigService.class);
+ cfgDict.put("eventGenerationPeriodInSeconds", EVENT_GENERATION_PERIOD);
+
+ cordMcast.componentConfigService = EasyMock.createNiceMock(ComponentConfigService.class);
replay(cordMcast.componentConfigService);
+ Set<McastRoute> route1Set = new HashSet<McastRoute>();
+ route1Set.add(route1);
+
cordMcast.mcastService = EasyMock.createNiceMock(MulticastRouteService.class);
expect(cordMcast.mcastService.getRoutes()).andReturn(Sets.newHashSet());
replay(cordMcast.mcastService);
+ cordMcastStatisticsManager.mcastService = EasyMock.createNiceMock(MulticastRouteService.class);
+ expect(cordMcastStatisticsManager.mcastService.getRoutes()).andReturn(route1Set).times(2);
+ replay(cordMcastStatisticsManager.mcastService);
+
+ TestUtils.setField(cordMcastStatisticsManager, "eventDispatcher", new TestEventDispatcher());
+
ComponentContext componentContext = EasyMock.createMock(ComponentContext.class);
- expect(componentContext.getProperties()).andReturn(cfgDict);
+ expect(componentContext.getProperties()).andReturn(cfgDict).times(2);
replay(componentContext);
+ cordMcast.cordMcastStatisticsService = cordMcastStatisticsManager;
+ cordMcastStatisticsManager.activate(componentContext);
cordMcast.activate(componentContext);
-
}
@After
@@ -289,7 +312,6 @@
}
-
@Test
public void testSourceAddedEvent() throws InterruptedException {
@@ -324,4 +346,48 @@
assertTrue(0 == nextMap.size());
}
+ @Test
+ public void mcastTestEventGeneration() throws InterruptedException {
+ //fetching route details used to push CordMcastStatisticsEvent.
+ IpAddress testGroup = route1.group();
+ String testSource = route1.source().isEmpty() ? "*" : route1.source().get().toString();
+ VlanId testVlan = cordMcast.assignedVlan();
+
+ // Thread is scheduled without any delay
+ assertAfter(WAIT, WAIT * 2, () ->
+ assertEquals(1, mockListener.mcastEventList.size()));
+
+ for (CordMcastStatisticsEvent event: mockListener.mcastEventList) {
+ assertEquals(event.type(), CordMcastStatisticsEvent.Type.STATUS_UPDATE);
+ }
+
+ CordMcastStatistics cordMcastStatistics = mockListener.mcastEventList.get(0).subject().get(0);
+ assertEquals(VlanId.NONE, cordMcastStatistics.getVlanId());
+ assertEquals(testVlan, cordMcastStatistics.getVlanId());
+ assertEquals(testSource, cordMcastStatistics.getSourceAddress());
+ assertEquals(testGroup, cordMcastStatistics.getGroupAddress());
+
+ // Test for vlanEnabled
+ Dictionary<String, Object> cfgDict = new Hashtable<>();
+ cfgDict.put("vlanEnabled", true);
+
+ ComponentContext componentContext = EasyMock.createMock(ComponentContext.class);
+ expect(componentContext.getProperties()).andReturn(cfgDict);
+ replay(componentContext);
+ cordMcast.modified(componentContext);
+ testVlan = cordMcast.assignedVlan();
+
+ assertAfter(EVENT_GENERATION_PERIOD, EVENT_GENERATION_PERIOD * 1000, () ->
+ assertEquals(2, mockListener.mcastEventList.size()));
+
+ for (CordMcastStatisticsEvent event: mockListener.mcastEventList) {
+ assertEquals(event.type(), CordMcastStatisticsEvent.Type.STATUS_UPDATE);
+ }
+
+ cordMcastStatistics = mockListener.mcastEventList.get(1).subject().get(0);
+ assertNotEquals(VlanId.NONE, cordMcastStatistics.getVlanId());
+ assertEquals(testVlan, cordMcastStatistics.getVlanId());
+ assertEquals(testSource, cordMcastStatistics.getSourceAddress());
+ assertEquals(testGroup, cordMcastStatistics.getGroupAddress());
+ }
}
diff --git a/src/test/java/org/opencord/cordmcast/McastTestBase.java b/src/test/java/org/opencord/cordmcast/McastTestBase.java
index ef04165..823df6b 100644
--- a/src/test/java/org/opencord/cordmcast/McastTestBase.java
+++ b/src/test/java/org/opencord/cordmcast/McastTestBase.java
@@ -15,19 +15,25 @@
*/
package org.opencord.cordmcast;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.HashMap;
import java.util.Set;
+import java.util.HashSet;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Iterator;
import org.onlab.packet.Ip4Address;
import org.onlab.packet.IpAddress;
+import org.onlab.packet.VlanId;
import org.onosproject.TestApplicationId;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreServiceAdapter;
+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.McastRoute;
import org.onosproject.net.AnnotationKeys;
@@ -40,6 +46,9 @@
import org.onosproject.net.HostId;
import org.onosproject.net.PortNumber;
import org.onosproject.net.SparseAnnotations;
+import org.onosproject.net.config.Config;
+import org.onosproject.net.config.NetworkConfigRegistryAdapter;
+import org.onosproject.net.config.basics.McastConfig;
import org.onosproject.net.device.DeviceServiceAdapter;
import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.TrafficTreatment;
@@ -57,6 +66,8 @@
import org.opencord.sadis.SadisService;
import org.opencord.sadis.SubscriberAndDeviceInformation;
+import static com.google.common.base.Preconditions.checkState;
+
public class McastTestBase {
// Map to store the forwardingObjective in flowObjectiveService.forward()
@@ -86,8 +97,9 @@
Map<HostId, Set<ConnectPoint>> sources = ImmutableMap.of(HOST_ID_NONE, SOURCES_CP);
protected static final IpAddress MULTICAST_IP = IpAddress.valueOf("224.0.0.22");
+ protected static final IpAddress SOURCE_IP = IpAddress.valueOf("192.168.1.1");
// Creating dummy route with IGMP type.
- McastRoute route1 = new McastRoute(null, MULTICAST_IP, McastRoute.Type.IGMP);
+ McastRoute route1 = new McastRoute(SOURCE_IP, MULTICAST_IP, McastRoute.Type.IGMP);
// Creating empty sink used in prevRoute
Set<ConnectPoint> sinksCp = new HashSet<ConnectPoint>(Arrays.asList());
@@ -100,6 +112,9 @@
// Flag to check unknown olt device
boolean knownOltFlag = false;
+ // For the tests reduce events period to 1s
+ protected static final int EVENT_GENERATION_PERIOD = 1;
+
class MockCoreService extends CoreServiceAdapter {
@Override
public ApplicationId registerApplication(String name) {
@@ -143,6 +158,60 @@
}
}
+ /**
+ * Mocks the McastConfig class to return vlan id value.
+ */
+ static class MockMcastConfig extends McastConfig {
+ @Override
+ public VlanId egressVlan() {
+ return VlanId.vlanId("4000");
+ }
+ }
+
+ /**
+ * Mocks the network config registry.
+ */
+ @SuppressWarnings("unchecked")
+ static final class TestNetworkConfigRegistry
+ extends NetworkConfigRegistryAdapter {
+ @Override
+ public <S, C extends Config<S>> C getConfig(S subject, Class<C> configClass) {
+ McastConfig mcastConfig = new MockMcastConfig();
+ return (C) mcastConfig;
+ }
+ }
+
+ 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;
+ }
+ }
+
+ public static class MockCordMcastStatisticsEventListener implements CordMcastStatisticsEventListener {
+ protected List<CordMcastStatisticsEvent> mcastEventList = new ArrayList<CordMcastStatisticsEvent>();
+
+ @Override
+ public void event(CordMcastStatisticsEvent event) {
+ mcastEventList.add(event);
+ }
+ }
+
private class MockSubService implements BaseInformationService<SubscriberAndDeviceInformation> {
MockSubscriberAndDeviceInformation deviceA =
new MockSubscriberAndDeviceInformation(SERIAL_NUMBER_OF_DEVICE_A, MANAGEMENT_IP_OF_A);