X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Fstatistics%2Fservices%2Fcompatibility%2FOpendaylightFlowStatisticsServiceDelegateImplTest.java;h=86fcdaa9a195f27ee14f2bc7289894a3667ff33f;hb=7f4b511776bcdeab7d965ec78fc4a6d5b626ef47;hp=835e489101cbd5b2987bd6448445c44a9194b59e;hpb=0f9364b3c813fe3b162c09851261dca33bbda9fc;p=openflowplugin.git diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/OpendaylightFlowStatisticsServiceDelegateImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/OpendaylightFlowStatisticsServiceDelegateImplTest.java index 835e489101..86fcdaa9a1 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/OpendaylightFlowStatisticsServiceDelegateImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/compatibility/OpendaylightFlowStatisticsServiceDelegateImplTest.java @@ -24,8 +24,10 @@ import org.opendaylight.openflowplugin.api.OFConstants; import org.opendaylight.openflowplugin.api.openflow.device.MessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey; import org.opendaylight.openflowplugin.impl.statistics.services.AbstractSingleStatsServiceTest; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.Counter32; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.Counter64; +import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager; +import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManagerFactory; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Counter32; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Counter64; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowStatisticsFromFlowTableInputBuilder; @@ -76,8 +78,9 @@ public class OpendaylightFlowStatisticsServiceDelegateImplTest extends AbstractS @Override public void setUp() { + final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager(); flowStatisticsServiceDelegate = new OpendaylightFlowStatisticsServiceDelegateImpl( - rqContextStack, deviceContext, notificationPublishService, new AtomicLong(21)); + rqContextStack, deviceContext, notificationPublishService, new AtomicLong(21), convertorManager); Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider) .commitEntry(Matchers.eq(42L), requestInput.capture(), Matchers.any(FutureCallback.class)); @@ -95,7 +98,7 @@ public class OpendaylightFlowStatisticsServiceDelegateImplTest extends AbstractS .setNode(createNodeRef("unitProt:123")) .setTableId(new TableId((short) 1)); - Mockito.when(translator.translate(Matchers.any(MultipartReply.class), Matchers.eq(deviceState), Matchers.any())) + Mockito.when(translator.translate(Matchers.any(MultipartReply.class), Matchers.eq(deviceInfo), Matchers.any())) .thenReturn(new AggregatedFlowStatisticsBuilder() .setByteCount(new Counter64(BigInteger.valueOf(50L))) .setPacketCount(new Counter64(BigInteger.valueOf(51L))) @@ -226,4 +229,4 @@ public class OpendaylightFlowStatisticsServiceDelegateImplTest extends AbstractS Mockito.verify(notificationPublishService, Mockito.timeout(NOTIFICATION_WAIT_TIMEOUT_MS)).offerNotification(Matchers.any(Notification.class)); } -} \ No newline at end of file +}