* 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.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+
import com.google.common.util.concurrent.FutureCallback;
-import java.math.BigInteger;
import java.util.Collections;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicLong;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
import org.mockito.Captor;
-import org.mockito.Matchers;
import org.mockito.Mockito;
-import org.opendaylight.openflowplugin.api.OFConstants;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+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.opendaylight.group.statistics.rev131111.GetAllGroupStatisticsInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetAllGroupStatisticsOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupDescriptionInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group.desc._case.MultipartReplyGroupDescBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group.desc._case.multipart.reply.group.desc.GroupDescBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group.features._case.MultipartReplyGroupFeaturesBuilder;
-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.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
/**
- * Test for {@link OpendaylightGroupStatisticsServiceImpl}
+ * Test for {@link OpendaylightGroupStatisticsServiceImpl}.
*/
public class OpendaylightGroupStatisticsServiceImplTest extends AbstractSingleStatsServiceTest {
- private static final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupId GROUP_ID =
- new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupId(123L);
+ private static final org.opendaylight.yang.gen.v1.urn
+ .opendaylight.openflow.common.types.rev130731.GroupId GROUP_ID = new org.opendaylight.yang.gen.v1.urn
+ .opendaylight.openflow.common.types.rev130731.GroupId(Uint32.valueOf(123));
@Captor
private ArgumentCaptor<MultipartRequestInput> requestInput;
private OpendaylightGroupStatisticsServiceImpl groupStatisticsService;
+ @Override
public void setUp() {
+ final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
groupStatisticsService = new OpendaylightGroupStatisticsServiceImpl(rqContextStack, deviceContext,
- new AtomicLong(), notificationPublishService);
+ new AtomicLong(), notificationPublishService, convertorManager);
Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider)
- .commitEntry(Matchers.eq(42L), requestInput.capture(), Matchers.any(FutureCallback.class));
+ .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any(FutureCallback.class));
}
@After
- public void tearDown() throws Exception {
- Mockito.verify(notificationPublishService).offerNotification(Matchers.<Notification>any());
+ public void tearDown() {
+ Mockito.verify(notificationPublishService).offerNotification(ArgumentMatchers.any());
}
@Test
rpcResult = RpcResultBuilder.<Object>success(Collections.singletonList(
new MultipartReplyMessageBuilder()
- .setVersion(OFConstants.OFP_VERSION_1_3)
+ .setVersion(EncodeConstants.OF_VERSION_1_3)
.setMultipartReplyBody(new MultipartReplyGroupDescCaseBuilder()
.setMultipartReplyGroupDesc(new MultipartReplyGroupDescBuilder()
.setGroupDesc(Collections.singletonList(new GroupDescBuilder()
.setGroupId(GROUP_ID)
.setBucketsList(Collections.singletonList(new BucketsListBuilder()
- .setWatchGroup(51L)
- .setWatchPort(new PortNumber(52L))
- .setWeight(53)
+ .setWatchGroup(Uint32.valueOf(51))
+ .setWatchPort(new PortNumber(Uint32.valueOf(52)))
+ .setWeight(Uint16.valueOf(53))
.build()))
.setType(GroupType.OFPGTALL)
.build()))
rpcResult = RpcResultBuilder.<Object>success(Collections.singletonList(
new MultipartReplyMessageBuilder()
- .setVersion(OFConstants.OFP_VERSION_1_3)
+ .setVersion(EncodeConstants.OF_VERSION_1_3)
.setMultipartReplyBody(new MultipartReplyGroupFeaturesCaseBuilder()
.setMultipartReplyGroupFeatures(new MultipartReplyGroupFeaturesBuilder()
.setActionsBitmap(Collections.singletonList(new ActionType(true,
false, false, false, false, false, false)))
.setCapabilities(new GroupCapabilities(true, false, false, false))
.setTypes(new GroupTypes(true, false, false, false))
- .setMaxGroups(Collections.singletonList(5L))
+ .setMaxGroups(Collections.singletonList(Uint32.valueOf(5L)))
.build())
.build())
.build()
public void testGetGroupStatistics() throws Exception {
GetGroupStatisticsInputBuilder input = new GetGroupStatisticsInputBuilder()
.setNode(createNodeRef("unitProt:123"))
- .setGroupId(new GroupId(21L));
+ .setGroupId(new GroupId(Uint32.valueOf(21)));
rpcResult = buildGroupStatsResponse();
private static RpcResult<Object> buildGroupStatsResponse() {
return RpcResultBuilder.<Object>success(Collections.singletonList(
new MultipartReplyMessageBuilder()
- .setVersion(OFConstants.OFP_VERSION_1_3)
+ .setVersion(EncodeConstants.OF_VERSION_1_3)
.setMultipartReplyBody(new MultipartReplyGroupCaseBuilder()
.setMultipartReplyGroup(new MultipartReplyGroupBuilder()
.setGroupStats(Collections.singletonList(new GroupStatsBuilder()
- .setByteCount(BigInteger.valueOf(21L))
- .setPacketCount(BigInteger.valueOf(22L))
- .setRefCount(23L)
- .setDurationSec(24L)
- .setDurationNsec(25L)
+ .setByteCount(Uint64.valueOf(21))
+ .setPacketCount(Uint64.valueOf(22))
+ .setRefCount(Uint32.valueOf(23))
+ .setDurationSec(Uint32.valueOf(24))
+ .setDurationNsec(Uint32.valueOf(25))
.setGroupId(GROUP_ID)
.setBucketStats(Collections.singletonList(new BucketStatsBuilder()
- .setByteCount(BigInteger.valueOf(26L))
- .setPacketCount(BigInteger.valueOf(27L))
+ .setByteCount(Uint64.valueOf(26))
+ .setPacketCount(Uint64.valueOf(27))
.build()))
.build()))
.build())
Code Review / openflowplugin.git / blobdiff