Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Exctract onDevicePrepared to interface
[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / statistics / StatisticsManagerImplTest.java
diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImplTest.java
index 0b9c4555591a6334161a9a63d88534919c7c768b..ebf9396c3d310e048f6b527038db8a286c2d5208 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsManagerImplTest.java
@@ -11,7 +11,6 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timeout;
@@ -20,7 +19,6 @@ import java.math.BigInteger;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import org.junit.Assert;
@@ -32,9 +30,7 @@ import org.mockito.Captor;
 import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
@@ -44,14 +40,9 @@ import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
-import org.opendaylight.openflowplugin.api.openflow.device.DeviceManager;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceState;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
-import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
-import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceInitializationPhaseHandler;
-import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceTerminationPhaseHandler;
 import org.opendaylight.openflowplugin.api.openflow.device.handlers.MultiMsgCollector;
-import org.opendaylight.openflowplugin.api.openflow.lifecycle.LifecycleService;
 import org.opendaylight.openflowplugin.api.openflow.registry.ItemLifeCycleRegistry;
 import org.opendaylight.openflowplugin.api.openflow.rpc.ItemLifeCycleSource;
 import org.opendaylight.openflowplugin.api.openflow.rpc.listener.ItemLifecycleListener;
@@ -65,17 +56,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FeaturesReply;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.NonZeroUint32Type;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.ChangeStatisticsWorkModeInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.GetStatisticsWorkModeOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.StatisticsManagerControlService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.StatisticsWorkMode;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -88,32 +77,22 @@ public class StatisticsManagerImplTest {
     public static final NodeId NODE_ID = new NodeId("ofp-unit-dummy-node-id");
 
     @Mock
-    RequestContextStack mockedRequestContextStack;
+    private ConnectionContext mockedPrimConnectionContext;
     @Mock
-    ConnectionContext mockedPrimConnectionContext;
+    private FeaturesReply mockedFeatures;
     @Mock
-    FeaturesReply mockedFeatures;
+    private ConnectionAdapter mockedConnectionAdapter;
     @Mock
-    GetFeaturesOutput mockedFeaturesOutput;
+    private MessageSpy mockedMessagSpy;
     @Mock
-    ConnectionAdapter mockedConnectionAdapter;
+    private DeviceContext mockedDeviceContext;
     @Mock
-    MessageSpy mockedMessagSpy;
+    private DeviceState mockedDeviceState;
     @Mock
-    DeviceContext mockedDeviceContext;
-    @Mock
-    DeviceState mockedDeviceState;
-    @Mock
-    DeviceInfo mockedDeviceInfo;
-    @Mock
-    DeviceInitializationPhaseHandler mockedDevicePhaseHandler;
-    @Mock
-    DeviceTerminationPhaseHandler mockedTerminationPhaseHandler;
+    private DeviceInfo mockedDeviceInfo;
     @Mock
     private RpcProviderRegistry rpcProviderRegistry;
     @Mock
-    private HashedWheelTimer hashedWheelTimer;
-    @Mock
     private OutboundQueue outboundQueue;
     @Mock
     private MultiMsgCollector multiMagCollector;
@@ -124,17 +103,9 @@ public class StatisticsManagerImplTest {
     @Mock
     private BindingAwareBroker.RpcRegistration<StatisticsManagerControlService> serviceControlRegistration;
     @Mock
-    private DeviceManager deviceManager;
-    @Mock
-    private GetFeaturesOutput featuresOutput;
-    @Mock
-    private DeviceInitializationPhaseHandler deviceInitializationPhaseHandler;
-    @Mock
     private DeviceInfo deviceInfo;
     @Mock
     private DataBroker dataBroker;
-    @Mock
-    private LifecycleService lifecycleService;
 
     private RequestContext<List<MultipartReply>> currentRequestContext;
     private StatisticsManagerImpl statisticsManager;
@@ -165,16 +136,13 @@ public class StatisticsManagerImplTest {
         when(mockedDeviceContext.getDeviceInfo()).thenReturn(mockedDeviceInfo);
         when(mockedDeviceContext.getPrimaryConnectionContext()).thenReturn(mockedPrimConnectionContext);
         when(mockedDeviceContext.getMessageSpy()).thenReturn(mockedMessagSpy);
-        when(mockedDeviceContext.getDeviceFlowRegistry()).thenReturn(new DeviceFlowRegistryImpl(dataBroker, nodePath));
+        when(mockedDeviceContext.getDeviceFlowRegistry()).thenReturn(new DeviceFlowRegistryImpl(OFConstants.OFP_VERSION_1_3, dataBroker, nodePath));
         when(mockedDeviceContext.getDeviceState()).thenReturn(mockedDeviceState);
         when(mockedDeviceContext.getMultiMsgCollector(
                 Matchers.<RequestContext<List<MultipartReply>>>any())).thenAnswer(
-                new Answer<MultiMsgCollector>() {
-                    @Override
-                    public MultiMsgCollector answer(InvocationOnMock invocation) throws Throwable {
-                        currentRequestContext = (RequestContext<List<MultipartReply>>) invocation.getArguments()[0];
-                        return multiMagCollector;
-                    }
+                invocation -> {
+                    currentRequestContext = (RequestContext<List<MultipartReply>>) invocation.getArguments()[0];
+                    return multiMagCollector;
                 }
         );
         when(mockedDeviceContext.getItemLifeCycleSourceRegistry()).thenReturn(itemLifeCycleRegistry);
@@ -183,45 +151,16 @@ public class StatisticsManagerImplTest {
                 Matchers.<StatisticsManagerControlService>any())).thenReturn(serviceControlRegistration);
 
         final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
-        statisticsManager = new StatisticsManagerImpl(rpcProviderRegistry, false, new HashedWheelTimer(), convertorManager);
-        statisticsManager.setDeviceInitializationPhaseHandler(deviceInitializationPhaseHandler);
-    }
-
-    @Test
-    public void testOnDeviceContextLevelUp() throws Exception {
-        Mockito.doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                final FutureCallback<OfHeader> callback = (FutureCallback<OfHeader>) invocation.getArguments()[2];
-                LOG.debug("committing entry: {}", ((MultipartRequestInput) invocation.getArguments()[1]).getType());
-                callback.onSuccess(null);
-                currentRequestContext.setResult(RpcResultBuilder.<List<MultipartReply>>success().build());
-                return null;
-            }
-        }).when(outboundQueue)
-                .commitEntry(Matchers.anyLong(), Matchers.<OfHeader>any(), Matchers.<FutureCallback<OfHeader>>any());
-
-        Mockito.when(lifecycleService.getDeviceContext()).thenReturn(mockedDeviceContext);
-        Mockito.when(mockedDeviceContext.getDeviceState()).thenReturn(mockedDeviceState);
-
-        statisticsManager.setDeviceInitializationPhaseHandler(mockedDevicePhaseHandler);
-        statisticsManager.onDeviceContextLevelUp(deviceInfo, lifecycleService);
-        verify(mockedDevicePhaseHandler).onDeviceContextLevelUp(deviceInfo, lifecycleService);
-    }
-
-    @Test
-    public void testOnDeviceContextClosed() throws Exception {
-        final StatisticsContext statisticContext = Mockito.mock(StatisticsContext.class);
-        final Map<DeviceInfo, StatisticsContext> contextsMap = getContextsMap(statisticsManager);
-
-        contextsMap.put(deviceInfo, statisticContext);
-        Assert.assertEquals(1, contextsMap.size());
-
-        statisticsManager.setDeviceTerminationPhaseHandler(mockedTerminationPhaseHandler);
-        statisticsManager.onDeviceContextLevelDown(deviceInfo);
-        verify(statisticContext).close();
-        verify(mockedTerminationPhaseHandler).onDeviceContextLevelDown(deviceInfo);
-        Assert.assertEquals(0, contextsMap.size());
+        final long basicTimerDelay = 3000L;
+        final long maximumTimerDelay = 900000L;
+
+        statisticsManager = new StatisticsManagerImpl(
+                new OpenflowProviderConfigBuilder()
+                        .setBasicTimerDelay(new NonZeroUint32Type(basicTimerDelay))
+                        .setMaximumTimerDelay(new NonZeroUint32Type(maximumTimerDelay))
+                        .setIsStatisticsPollingOn(false)
+                        .build(), rpcProviderRegistry, new HashedWheelTimer(),
+                convertorManager);
     }
 
     private static Map<DeviceInfo, StatisticsContext> getContextsMap(final StatisticsManagerImpl statisticsManager)
@@ -250,14 +189,11 @@ public class StatisticsManagerImplTest {
     @Test
     public void testChangeStatisticsWorkMode1() throws Exception {
         final StatisticsContext statisticContext = Mockito.mock(StatisticsContext.class);
-        when(statisticContext.getPollTimeout()).thenReturn(
-                Optional.<Timeout>empty());
         when(itemLifeCycleRegistry.getLifeCycleSources()).thenReturn(
                 Collections.<ItemLifeCycleSource>emptyList());
 
         when(statisticContext.gainDeviceContext()).thenReturn(mockedDeviceContext);
         when(statisticContext.gainDeviceState()).thenReturn(mockedDeviceState);
-        when(lifecycleService.getDeviceContext()).thenReturn(mockedDeviceContext);
 
         getContextsMap(statisticsManager).put(deviceInfo, statisticContext);
 
@@ -269,8 +205,8 @@ public class StatisticsManagerImplTest {
                 .changeStatisticsWorkMode(changeStatisticsWorkModeInputBld.build());
 
         checkWorkModeChangeOutcome(workMode);
-        Mockito.verify(itemLifeCycleRegistry).getLifeCycleSources();
-        Mockito.verify(statisticContext).getPollTimeout();
+        verify(itemLifeCycleRegistry).getLifeCycleSources();
+        verify(statisticContext).stopGatheringData();
     }
 
     private static void checkWorkModeChangeOutcome(Future<RpcResult<Void>> workMode) throws InterruptedException, ExecutionException {
@@ -289,8 +225,6 @@ public class StatisticsManagerImplTest {
         final Timeout pollTimeout = Mockito.mock(Timeout.class);
         final ItemLifeCycleSource itemLifecycleSource = Mockito.mock(ItemLifeCycleSource.class);
         final StatisticsContext statisticContext = Mockito.mock(StatisticsContext.class);
-        when(statisticContext.getPollTimeout()).thenReturn(
-                Optional.of(pollTimeout));
         when(itemLifeCycleRegistry.getLifeCycleSources()).thenReturn(
                 Collections.singletonList(itemLifecycleSource));
 
@@ -298,7 +232,7 @@ public class StatisticsManagerImplTest {
 
         when(statisticContext.gainDeviceContext()).thenReturn(mockedDeviceContext);
         when(statisticContext.gainDeviceState()).thenReturn(mockedDeviceState);
-        when(lifecycleService.getDeviceContext()).thenReturn(mockedDeviceContext);
+//        when(lifecycleService.getDeviceContext()).thenReturn(mockedDeviceContext);
 
         final ChangeStatisticsWorkModeInputBuilder changeStatisticsWorkModeInputBld =
                 new ChangeStatisticsWorkModeInputBuilder()
@@ -307,10 +241,9 @@ public class StatisticsManagerImplTest {
         Future<RpcResult<Void>> workMode = statisticsManager.changeStatisticsWorkMode(changeStatisticsWorkModeInputBld.build());
         checkWorkModeChangeOutcome(workMode);
 
-        Mockito.verify(itemLifeCycleRegistry).getLifeCycleSources();
-        Mockito.verify(statisticContext).getPollTimeout();
-        Mockito.verify(pollTimeout).cancel();
-        Mockito.verify(itemLifecycleSource).setItemLifecycleListener(Matchers.<ItemLifecycleListener>any());
+        verify(itemLifeCycleRegistry).getLifeCycleSources();
+        verify(statisticContext).stopGatheringData();
+        verify(itemLifecycleSource).setItemLifecycleListener(Matchers.<ItemLifecycleListener>any());
     }
 
     /**
@@ -327,8 +260,6 @@ public class StatisticsManagerImplTest {
                 .setItemLifecycleListener(itemLifeCycleListenerCapt.capture());
 
         final StatisticsContext statisticContext = Mockito.mock(StatisticsContext.class);
-        when(statisticContext.getPollTimeout()).thenReturn(
-                Optional.of(pollTimeout));
         when(statisticContext.getItemLifeCycleListener()).thenReturn(
                 Mockito.mock(ItemLifecycleListener.class));
         when(itemLifeCycleRegistry.getLifeCycleSources()).thenReturn(
@@ -338,7 +269,7 @@ public class StatisticsManagerImplTest {
 
         when(statisticContext.gainDeviceContext()).thenReturn(mockedDeviceContext);
         when(statisticContext.gainDeviceState()).thenReturn(mockedDeviceState);
-        when(lifecycleService.getDeviceContext()).thenReturn(mockedDeviceContext);
+//        when(lifecycleService.getDeviceContext()).thenReturn(mockedDeviceContext);
 
         final ChangeStatisticsWorkModeInputBuilder changeStatisticsWorkModeInputBld =
                 new ChangeStatisticsWorkModeInputBuilder()
@@ -354,9 +285,8 @@ public class StatisticsManagerImplTest {
                 changeStatisticsWorkModeInputBld.build());
         checkWorkModeChangeOutcome(workMode);
 
-        Mockito.verify(itemLifeCycleRegistry, Mockito.times(2)).getLifeCycleSources();
-        Mockito.verify(statisticContext).getPollTimeout();
-        Mockito.verify(pollTimeout).cancel();
+        verify(itemLifeCycleRegistry, times(2)).getLifeCycleSources();
+        verify(statisticContext).stopGatheringData();
 
         final List<ItemLifecycleListener> itemLifeCycleListenerValues = itemLifeCycleListenerCapt.getAllValues();
         Assert.assertEquals(2, itemLifeCycleListenerValues.size());
@@ -367,18 +297,17 @@ public class StatisticsManagerImplTest {
     @Test
     public void testClose() throws Exception {
         statisticsManager.close();
-        Mockito.verify(serviceControlRegistration).close();
+        verify(serviceControlRegistration).close();
     }
 
     @Test
     public void testCalculateTimerDelay() throws Exception {
         final TimeCounter timeCounter = Mockito.mock(TimeCounter.class);
         when(timeCounter.getAverageTimeBetweenMarks()).thenReturn(2000L, (Long)4000L);
-
         statisticsManager.calculateTimerDelay(timeCounter);
-        Assert.assertEquals(3000L, StatisticsManagerImpl.getCurrentTimerDelay());
+        Assert.assertEquals(3000L, statisticsManager.getCurrentTimerDelay());
         statisticsManager.calculateTimerDelay(timeCounter);
-        Assert.assertEquals(6000L, StatisticsManagerImpl.getCurrentTimerDelay());
+        Assert.assertEquals(6000L, statisticsManager.getCurrentTimerDelay());
     }
 
     @Test
@@ -396,11 +325,11 @@ public class StatisticsManagerImplTest {
         when(statisticsContext.gatherDynamicData()).thenReturn(Futures.immediateCheckedFuture(Boolean.TRUE));
         when(statisticsContext.isSchedulingEnabled()).thenReturn(Boolean.TRUE);
         statisticsManager.pollStatistics(mockedDeviceContext.getDeviceState(), statisticsContext, mockTimerCounter, mockedDeviceInfo);
-        Mockito.verify(mockTimerCounter).markStart();
-        Mockito.verify(mockTimerCounter).addTimeMark();
+        verify(mockTimerCounter).markStart();
+        verify(mockTimerCounter).addTimeMark();
 
         when(statisticsContext.gatherDynamicData()).thenReturn(Futures.immediateFailedFuture(new Throwable("error msg")));
         statisticsManager.pollStatistics(mockedDeviceContext.getDeviceState(), statisticsContext, mockTimerCounter, mockedDeviceInfo);
-        Mockito.verify(mockTimerCounter,times(2)).addTimeMark();
+        verify(mockTimerCounter,times(2)).addTimeMark();
     }
 }
OpenFlow Plugin