X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Fstatistics%2Fservices%2Fdirect%2Fmultilayer%2FMeterDirectStatisticsServiceTest.java;h=c0fb584091e63b9d2a7096ed498601b97bcb73f0;hb=3ee047a21cbd0754dabaab6d01708d5c20be80fd;hp=3f79b2140520d9984e31d8ca74f4494a96ba3ccc;hpb=9688b3b10ee4113753705f0080b29cd30e61a85d;p=openflowplugin.git diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/MeterDirectStatisticsServiceTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/MeterDirectStatisticsServiceTest.java index 3f79b21405..c0fb584091 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/MeterDirectStatisticsServiceTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/MeterDirectStatisticsServiceTest.java @@ -5,26 +5,25 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.openflowplugin.impl.statistics.services.direct.multilayer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.math.BigInteger; -import java.util.Collections; import java.util.List; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import java.util.Map; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.openflowplugin.api.openflow.device.Xid; import org.opendaylight.openflowplugin.impl.statistics.services.direct.AbstractDirectStatisticsServiceTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetMeterStatisticsInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetMeterStatisticsOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStatsKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput; @@ -34,26 +33,28 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter._case.multipart.reply.meter.MeterStatsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.meter._case.MultipartRequestMeter; +import org.opendaylight.yangtools.yang.binding.util.BindingMap; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint64; public class MeterDirectStatisticsServiceTest extends AbstractDirectStatisticsServiceTest { - static final Long METER_NO = 1L; - private MeterDirectStatisticsService service; + private static final Uint32 METER_NO = Uint32.ONE; + private MultiGetMeterStatistics service; @Override - public void setUp() throws Exception { - service = new MeterDirectStatisticsService(requestContextStack, deviceContext, convertorManager, - multipartWriterProvider); + public void setUp() { + service = new MultiGetMeterStatistics(requestContextStack, deviceContext, convertorManager, + multipartWriterProvider); } @Override - public void testBuildRequestBody() throws Exception { + public void testBuildRequestBody() { final GetMeterStatisticsInput input = mock(GetMeterStatisticsInput.class); - when(input.getNode()).thenReturn(createNodeRef(NODE_ID)); when(input.getMeterId()).thenReturn(new MeterId(METER_NO)); final MultipartRequestMeterCase body = (MultipartRequestMeterCase) ((MultipartRequestInput) service - .buildRequest(new Xid(42L), input)).getMultipartRequestBody(); + .buildRequest(new Xid(Uint32.valueOf(42L)), input)).getMultipartRequestBody(); final MultipartRequestMeter meter = body.getMultipartRequestMeter(); @@ -61,46 +62,48 @@ public class MeterDirectStatisticsServiceTest extends AbstractDirectStatisticsSe } @Override - public void testBuildReply() throws Exception { + public void testBuildReply() { final MultipartReply reply = mock(MultipartReply.class); final MultipartReplyMeterCase MeterCase = mock(MultipartReplyMeterCase.class); final MultipartReplyMeter meter = mock(MultipartReplyMeter.class); final MeterStats meterStat = new MeterStatsBuilder().setMeterId( new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterId(METER_NO)) - .setByteInCount(BigInteger.ONE).setPacketInCount(BigInteger.ONE).setDurationSec(1L).setDurationNsec(1L) - .setFlowCount(0L).setMeterBandStats(Collections.emptyList()).build(); + .setByteInCount(Uint64.ONE).setPacketInCount(Uint64.ONE).setDurationSec(Uint32.ONE) + .setDurationNsec(Uint32.ONE).setFlowCount(Uint32.ZERO).setMeterBandStats(List.of()) + .build(); - final List meterStats = Collections.singletonList(meterStat); - final List input = Collections.singletonList(reply); + final List meterStats = List.of(meterStat); + final List input = List.of(reply); when(meter.getMeterStats()).thenReturn(meterStats); when(MeterCase.getMultipartReplyMeter()).thenReturn(meter); when(reply.getMultipartReplyBody()).thenReturn(MeterCase); final GetMeterStatisticsOutput output = service.buildReply(input, true); - assertTrue(output.getMeterStats().size() > 0); + assertTrue(output.nonnullMeterStats().size() > 0); final org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats - stats = output.getMeterStats().get(0); + stats = output.nonnullMeterStats().values().iterator().next(); assertEquals(stats.getMeterId().getValue(), METER_NO); } @Override - public void testStoreStatistics() throws Exception { + public void testStoreStatistics() { final org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats stat = mock( org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats .class); + when(stat.key()).thenReturn(new MeterStatsKey(new MeterId(METER_NO))); when(stat.getMeterId()).thenReturn(new MeterId(METER_NO)); - final List - stats = Collections.singletonList(stat); + final Map + stats = BindingMap.of(stat); final GetMeterStatisticsOutput output = mock(GetMeterStatisticsOutput.class); - when(output.getMeterStats()).thenReturn(stats); + when(output.nonnullMeterStats()).thenReturn(stats); - multipartWriterProvider.lookup(MultipartType.OFPMPMETER).get().write(output, true); + multipartWriterProvider.lookup(MultipartType.OFPMPMETER).orElseThrow().write(output, true); verify(deviceContext).writeToTransactionWithParentsSlow(eq(LogicalDatastoreType.OPERATIONAL), any(), any()); } }