* 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;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.verify;
import com.google.common.util.concurrent.FutureCallback;
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.concurrent.Future;
+import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
import org.mockito.Captor;
-import org.mockito.Mockito;
-import org.opendaylight.openflowplugin.api.OFConstants;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManagerFactory;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterConfigStatisticsInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterConfigStatisticsOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterStatisticsInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterStatisticsOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterFeaturesInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterFeaturesOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterStatisticsInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterStatisticsOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandTypeBitmap;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config._case.multipart.reply.meter.config.MeterConfigBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config._case.multipart.reply.meter.config.meter.config.BandsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.features._case.MultipartReplyMeterFeaturesBuilder;
-import org.opendaylight.yangtools.yang.binding.Notification;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
+import org.opendaylight.yangtools.yang.common.Uint8;
/**
* Test for {@link OpendaylightMeterStatisticsServiceImpl}.
*/
+@Deprecated
public class OpendaylightMeterStatisticsServiceImplTest extends AbstractSingleStatsServiceTest {
-
private static final org.opendaylight.yang.gen.v1.urn
- .opendaylight.openflow.common.types.rev130731.MeterId METER_ID =
- new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterId(123L);
+ .opendaylight.openflow.common.types.rev130731.MeterId METER_ID = new org.opendaylight.yang.gen.v1.urn
+ .opendaylight.openflow.common.types.rev130731.MeterId(Uint32.valueOf(123));
@Captor
private ArgumentCaptor<MultipartRequestInput> requestInput;
- private OpendaylightMeterStatisticsServiceImpl meterStatisticsService;
+ private GetAllMeterStatisticsImpl getAllMeterStatistics;
+ private GetMeterStatisticsImpl getMeterStatistics;
+ private GetAllMeterConfigStatisticsImpl getAllMeterConfigStatistics;
+ private GetMeterFeaturesImpl getMeterFeatures;
+ @Override
public void setUp() {
- final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
- meterStatisticsService = new OpendaylightMeterStatisticsServiceImpl(rqContextStack, deviceContext,
- new AtomicLong(), notificationPublishService, convertorManager);
-
- Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider)
- .commitEntry(eq(42L), requestInput.capture(), any(FutureCallback.class));
+ final var xid = new AtomicLong();
+ final var convertorManager = ConvertorManagerFactory.createDefaultManager();
+
+ getAllMeterStatistics = new GetAllMeterStatisticsImpl(rqContextStack, deviceContext, xid,
+ notificationPublishService, convertorManager);
+ getMeterStatistics = new GetMeterStatisticsImpl(rqContextStack, deviceContext, xid,
+ notificationPublishService, convertorManager);
+ getAllMeterConfigStatistics = new GetAllMeterConfigStatisticsImpl(rqContextStack, deviceContext, xid,
+ notificationPublishService, convertorManager);
+ getMeterFeatures = new GetMeterFeaturesImpl(rqContextStack, deviceContext, xid,
+ notificationPublishService, convertorManager);
+
+ doAnswer(answerVoidToCallback).when(outboundQueueProvider)
+ .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any(FutureCallback.class));
}
@After
- public void tearDown() throws Exception {
- Mockito.verify(notificationPublishService).offerNotification(ArgumentMatchers.<Notification>any());
+ public void tearDown() {
+ verify(notificationPublishService).offerNotification(ArgumentMatchers.any());
}
@Test
GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder()
.setNode(createNodeRef("unitProt:123"));
- rpcResult = RpcResultBuilder.<Object>success(Collections.singletonList(
+ rpcResult = RpcResultBuilder.<Object>success(List.of(
new MultipartReplyMessageBuilder()
- .setVersion(OFConstants.OFP_VERSION_1_3)
+ .setVersion(EncodeConstants.OF_VERSION_1_3)
.setMultipartReplyBody(new MultipartReplyMeterConfigCaseBuilder()
.setMultipartReplyMeterConfig(new MultipartReplyMeterConfigBuilder()
- .setMeterConfig(Collections.singletonList(new MeterConfigBuilder()
+ .setMeterConfig(List.of(new MeterConfigBuilder()
.setFlags(new MeterFlags(true, false, false, false))
.setMeterId(METER_ID)
- .setBands(Collections.singletonList(new BandsBuilder()
+ .setBands(List.of(new BandsBuilder()
.setMeterBand(new MeterBandDropCaseBuilder()
.setMeterBandDrop(new MeterBandDropBuilder()
- .setBurstSize(61L)
- .setRate(62L)
+ .setBurstSize(Uint32.valueOf(61))
+ .setRate(Uint32.valueOf(62))
.setType(MeterBandType.OFPMBTDROP)
.build())
.build())
.build()
)).build();
- final Future<RpcResult<GetAllMeterConfigStatisticsOutput>> resultFuture
- = meterStatisticsService.getAllMeterConfigStatistics(input.build());
+ final var resultFuture = getAllMeterConfigStatistics.invoke(input.build());
- Assert.assertTrue(resultFuture.isDone());
- final RpcResult<GetAllMeterConfigStatisticsOutput> rpcResult = resultFuture.get();
- Assert.assertTrue(rpcResult.isSuccessful());
- Assert.assertEquals(MultipartType.OFPMPMETERCONFIG, requestInput.getValue().getType());
+ assertTrue(resultFuture.isDone());
+ final var rpcResult = resultFuture.get();
+ assertTrue(rpcResult.isSuccessful());
+ assertEquals(MultipartType.OFPMPMETERCONFIG, requestInput.getValue().getType());
}
@Test
rpcResult = buildMeterStatisticsReply();
- final Future<RpcResult<GetAllMeterStatisticsOutput>> resultFuture
- = meterStatisticsService.getAllMeterStatistics(input.build());
+ final var resultFuture = getAllMeterStatistics.invoke(input.build());
- Assert.assertTrue(resultFuture.isDone());
- final RpcResult<GetAllMeterStatisticsOutput> rpcResult = resultFuture.get();
- Assert.assertTrue(rpcResult.isSuccessful());
- Assert.assertEquals(MultipartType.OFPMPMETER, requestInput.getValue().getType());
+ assertTrue(resultFuture.isDone());
+ final var rpcResult = resultFuture.get();
+ assertTrue(rpcResult.isSuccessful());
+ assertEquals(MultipartType.OFPMPMETER, requestInput.getValue().getType());
}
@Test
GetMeterFeaturesInputBuilder input = new GetMeterFeaturesInputBuilder()
.setNode(createNodeRef("unitProt:123"));
- rpcResult = RpcResultBuilder.<Object>success(Collections.singletonList(
+ rpcResult = RpcResultBuilder.<Object>success(List.of(
new MultipartReplyMessageBuilder()
- .setVersion(OFConstants.OFP_VERSION_1_3)
+ .setVersion(EncodeConstants.OF_VERSION_1_3)
.setMultipartReplyBody(new MultipartReplyMeterFeaturesCaseBuilder()
.setMultipartReplyMeterFeatures(new MultipartReplyMeterFeaturesBuilder()
.setBandTypes(new MeterBandTypeBitmap(true, false))
.setCapabilities(new MeterFlags(true, false, false, false))
- .setMaxBands((short) 71)
- .setMaxColor((short) 72)
- .setMaxMeter(73L)
+ .setMaxBands(Uint8.valueOf(71))
+ .setMaxColor(Uint8.valueOf(72))
+ .setMaxMeter(Uint32.valueOf(73))
.build())
.build())
.build()
)).build();
- final Future<RpcResult<GetMeterFeaturesOutput>> resultFuture
- = meterStatisticsService.getMeterFeatures(input.build());
+ final var resultFuture = getMeterFeatures.invoke(input.build());
- Assert.assertTrue(resultFuture.isDone());
- final RpcResult<GetMeterFeaturesOutput> rpcResult = resultFuture.get();
- Assert.assertTrue(rpcResult.isSuccessful());
- Assert.assertEquals(MultipartType.OFPMPMETERFEATURES, requestInput.getValue().getType());
+ assertTrue(resultFuture.isDone());
+ final var rpcResult = resultFuture.get();
+ assertTrue(rpcResult.isSuccessful());
+ assertEquals(MultipartType.OFPMPMETERFEATURES, requestInput.getValue().getType());
}
@Test
public void testGetMeterStatistics() throws Exception {
GetMeterStatisticsInputBuilder input = new GetMeterStatisticsInputBuilder()
.setNode(createNodeRef("unitProt:123"))
- .setMeterId(new MeterId(21L));
+ .setMeterId(new MeterId(Uint32.valueOf(21)));
rpcResult = buildMeterStatisticsReply();
- final Future<RpcResult<GetMeterStatisticsOutput>> resultFuture
- = meterStatisticsService.getMeterStatistics(input.build());
+ final var resultFuture = getMeterStatistics.invoke(input.build());
- Assert.assertTrue(resultFuture.isDone());
- final RpcResult<GetMeterStatisticsOutput> rpcResult = resultFuture.get();
- Assert.assertTrue(rpcResult.isSuccessful());
- Assert.assertEquals(MultipartType.OFPMPMETER, requestInput.getValue().getType());
+ assertTrue(resultFuture.isDone());
+ final var rpcResult = resultFuture.get();
+ assertTrue(rpcResult.isSuccessful());
+ assertEquals(MultipartType.OFPMPMETER, requestInput.getValue().getType());
}
protected RpcResult<Object> buildMeterStatisticsReply() {
- return RpcResultBuilder.<Object>success(Collections.singletonList(
+ return RpcResultBuilder.<Object>success(List.of(
new MultipartReplyMessageBuilder()
- .setVersion(OFConstants.OFP_VERSION_1_3)
+ .setVersion(EncodeConstants.OF_VERSION_1_3)
.setMultipartReplyBody(new MultipartReplyMeterCaseBuilder()
.setMultipartReplyMeter(new MultipartReplyMeterBuilder()
- .setMeterStats(Collections.singletonList(new MeterStatsBuilder()
+ .setMeterStats(List.of(new MeterStatsBuilder()
.setMeterId(METER_ID)
- .setByteInCount(BigInteger.valueOf(81L))
- .setDurationSec(82L)
- .setDurationNsec(83L)
- .setFlowCount(84L)
- .setPacketInCount(BigInteger.valueOf(85L))
- .setMeterBandStats(Collections.singletonList(new MeterBandStatsBuilder()
- .setByteBandCount(BigInteger.valueOf(86L))
- .setPacketBandCount(BigInteger.valueOf(87L))
+ .setByteInCount(Uint64.valueOf(81))
+ .setDurationSec(Uint32.valueOf(82))
+ .setDurationNsec(Uint32.valueOf(83))
+ .setFlowCount(Uint32.valueOf(84))
+ .setPacketInCount(Uint64.valueOf(85))
+ .setMeterBandStats(List.of(new MeterBandStatsBuilder()
+ .setByteBandCount(Uint64.valueOf(86))
+ .setPacketBandCount(Uint64.valueOf(87))
.build()))
.build()))
.build())
Code Review / openflowplugin.git / blobdiff