Update MRI upstreams for Phosphorus

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / statistics / MultipartReplyTranslatorTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/MultipartReplyTranslatorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/MultipartReplyTranslatorTest.java
index 456742883e9a28bd7d0d65e4fbb918551ed7a3d6..dfc2bf06fa3d8876317166c43edabb15b176e50a 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/MultipartReplyTranslatorTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/MultipartReplyTranslatorTest.java
@@ -13,9 +13,8 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.Lists;
-import java.math.BigInteger;
 import java.util.Collections;
-import java.util.List;
+import java.util.Map;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.openflowplugin.api.OFConstants;
@@ -30,6 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Group
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupStatisticsReply;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStats;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStatsKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.statistics.types.rev130925.AggregateFlowStatistics;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupType;
@@ -53,31 +53,33 @@ 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.port.stats._case.multipart.reply.port.stats.PortStatsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.node.connector.statistics.and.port.number.map.NodeConnectorStatisticsAndPortNumberMap;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
 
 public class MultipartReplyTranslatorTest {
 
-    private static final BigInteger DUMMY_DATAPATH_ID = new BigInteger("21");
-    private static final Long DUMMY_XID = 1L;
-    private static final BigInteger DUMMY_BYTE_COUNT = new BigInteger("31");
-    private static final BigInteger DUMMY_PACKET_COUNT = new BigInteger("41");
-    private static final Long DUMMY_FLOW_COUNT = 51L;
-    private static final Long DUMMY_PORT_NO = 154L;
-    private static final BigInteger DUMMY_RX_BYTES = new BigInteger("155");
-    private static final BigInteger DUMMY_TX_BYTES = new BigInteger("165");
-    private static final BigInteger DUMMY_RX_PACKETS = new BigInteger("175");
-    private static final BigInteger DUMMY_TX_PACKETS = new BigInteger("185");
-    private static final BigInteger DUMMY_COLLISIONS = new BigInteger("195");
-    private static final BigInteger DUMMY_RX_CRC_ERR = new BigInteger("205");
-    private static final BigInteger DUMMY_RX_DROPPED = new BigInteger("215");
-    private static final BigInteger DUMMY_RX_ERRORS = new BigInteger("225");
-    private static final BigInteger DUMMY_RX_FRAME_ERR = new BigInteger("235");
-    private static final BigInteger DUMMY_OVER_ERR = new BigInteger("245");
-    private static final BigInteger DUMMY_TX_DROPPED = new BigInteger("255");
-    private static final BigInteger DUMMY_TX_ERRORS = new BigInteger("265");
-    private static final Long DUMMY_DURATION_SEC = 3453L;
-    private static final Long DUMMY_DURATION_NSEC = 3343L;
-    private static final GroupId DUMMY_GROUP_ID = new GroupId(55L);
-    private static final Long DUMMY_REF_COUNT = 1234L;
+    private static final Uint64 DUMMY_DATAPATH_ID = Uint64.valueOf(21);
+    private static final Uint32 DUMMY_XID = Uint32.ONE;
+    private static final Uint64 DUMMY_BYTE_COUNT = Uint64.valueOf(31);
+    private static final Uint64 DUMMY_PACKET_COUNT = Uint64.valueOf(41);
+    private static final Uint32 DUMMY_FLOW_COUNT = Uint32.valueOf(51);
+    private static final Uint32 DUMMY_PORT_NO = Uint32.valueOf(154);
+    private static final Uint64 DUMMY_RX_BYTES = Uint64.valueOf(155);
+    private static final Uint64 DUMMY_TX_BYTES = Uint64.valueOf(165);
+    private static final Uint64 DUMMY_RX_PACKETS = Uint64.valueOf(175);
+    private static final Uint64 DUMMY_TX_PACKETS = Uint64.valueOf(185);
+    private static final Uint64 DUMMY_COLLISIONS = Uint64.valueOf(195);
+    private static final Uint64 DUMMY_RX_CRC_ERR = Uint64.valueOf(205);
+    private static final Uint64 DUMMY_RX_DROPPED = Uint64.valueOf(215);
+    private static final Uint64 DUMMY_RX_ERRORS = Uint64.valueOf(225);
+    private static final Uint64 DUMMY_RX_FRAME_ERR = Uint64.valueOf(235);
+    private static final Uint64 DUMMY_OVER_ERR = Uint64.valueOf(245);
+    private static final Uint64 DUMMY_TX_DROPPED = Uint64.valueOf(255);
+    private static final Uint64 DUMMY_TX_ERRORS = Uint64.valueOf(265);
+    private static final Uint32 DUMMY_DURATION_SEC = Uint32.valueOf(3453);
+    private static final Uint32 DUMMY_DURATION_NSEC = Uint32.valueOf(3343);
+    private static final GroupId DUMMY_GROUP_ID = new GroupId(Uint32.valueOf(55));
+    private static final Uint32 DUMMY_REF_COUNT = Uint32.valueOf(1234);
     private static final GroupTypes DUMMY_GROUPS_TYPE = GroupTypes.GroupAll;
     private static final GroupType DUMMY_GROUP_TYPE = GroupType.OFPGTALL;
     private static final ConvertorManager CONVERTOR_MANAGER = ConvertorManagerFactory.createDefaultManager();
@@ -143,11 +145,11 @@ public class MultipartReplyTranslatorTest {
         org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.NodeConnectorStatisticsAndPortNumberMap
                 nodeConnectorStatisticsUpdate = (org.opendaylight.yang.gen.v1.urn
                 .opendaylight.port.statistics.rev131214.NodeConnectorStatisticsAndPortNumberMap) dataObject;
-        List<NodeConnectorStatisticsAndPortNumberMap> nodeConnectorStatisticsAndPortNumberMaps =
-                nodeConnectorStatisticsUpdate.getNodeConnectorStatisticsAndPortNumberMap();
+        var nodeConnectorStatisticsAndPortNumberMaps =
+                nodeConnectorStatisticsUpdate.nonnullNodeConnectorStatisticsAndPortNumberMap();
         assertEquals(1, nodeConnectorStatisticsAndPortNumberMaps.size());
         NodeConnectorStatisticsAndPortNumberMap nodeConnectorStatisticsAndPortNumberMap =
-                nodeConnectorStatisticsAndPortNumberMaps.get(0);
+                nodeConnectorStatisticsAndPortNumberMaps.values().iterator().next();
         assertEquals("openflow:" + DUMMY_DATAPATH_ID + ":" + DUMMY_PORT_NO,
                 nodeConnectorStatisticsAndPortNumberMap.getNodeConnectorId().getValue());
         assertEquals(DUMMY_RX_BYTES, nodeConnectorStatisticsAndPortNumberMap.getBytes().getReceived());
@@ -180,12 +182,9 @@ public class MultipartReplyTranslatorTest {
         DataContainer dataObject = validateOutput(result);
         assertTrue(dataObject instanceof GroupStatisticsReply);
         GroupStatisticsReply groupStatisticsUpdate = (GroupStatisticsReply)dataObject;
-        List<org.opendaylight.yang.gen.v1.urn
-                .opendaylight.group.types.rev131018.group.statistics.reply.GroupStats> groupStats =
-                groupStatisticsUpdate.getGroupStats();
+        var groupStats = groupStatisticsUpdate.nonnullGroupStats();
         assertEquals(1, groupStats.size());
-        org.opendaylight.yang.gen.v1.urn
-                .opendaylight.group.types.rev131018.group.statistics.reply.GroupStats groupStat = groupStats.get(0);
+        var groupStat = groupStats.values().iterator().next();
 
         assertEquals(DUMMY_BYTE_COUNT, groupStat.getByteCount().getValue());
         assertEquals(DUMMY_DURATION_SEC, groupStat.getDuration().getSecond().getValue());
@@ -211,14 +210,14 @@ public class MultipartReplyTranslatorTest {
         DataContainer dataObject = validateOutput(result);
         assertTrue(dataObject instanceof GroupDescStatsReply);
         GroupDescStatsReply groupStatistics = (GroupDescStatsReply) dataObject;
-        List<GroupDescStats> groupDescStats = groupStatistics.getGroupDescStats();
+        Map<GroupDescStatsKey, GroupDescStats> groupDescStats = groupStatistics.nonnullGroupDescStats();
         assertEquals(1, groupDescStats.size());
-        GroupDescStats groupDescStat = groupDescStats.get(0);
+        GroupDescStats groupDescStat = groupDescStats.values().iterator().next();
         assertEquals(DUMMY_GROUP_ID.getValue(),groupDescStat.getGroupId().getValue());
         assertEquals(DUMMY_GROUPS_TYPE,groupDescStat.getGroupType());
     }
 
-    private MultipartReplyBody prepareMultipartReplyGroupDesc() {
+    private static MultipartReplyBody prepareMultipartReplyGroupDesc() {
         GroupDescBuilder groupDescBuilder = new GroupDescBuilder();
         groupDescBuilder.setGroupId(DUMMY_GROUP_ID);
         groupDescBuilder.setBucketsList(Collections.emptyList());
@@ -231,7 +230,7 @@ public class MultipartReplyTranslatorTest {
         return multipartReplyGroupDescCaseBuilder.build();
     }
 
-    private MultipartReplyBody prepareMultipartReplyGroup() {
+    private static MultipartReplyBody prepareMultipartReplyGroup() {
         GroupStatsBuilder groupStatsBuilder = new GroupStatsBuilder();
         groupStatsBuilder.setByteCount(DUMMY_BYTE_COUNT);
         groupStatsBuilder.setBucketStats(Collections.emptyList());
@@ -247,7 +246,7 @@ public class MultipartReplyTranslatorTest {
         return multipartReplyGroupCaseBuilder.build();
     }
 
-    private MultipartReplyBody prepareMultipartReplyPortStats() {
+    private static MultipartReplyBody prepareMultipartReplyPortStats() {
         PortStatsBuilder dummyPortStatBuilder = new PortStatsBuilder();
         dummyPortStatBuilder.setPortNo(DUMMY_PORT_NO);
         dummyPortStatBuilder.setRxBytes(DUMMY_RX_BYTES);
@@ -271,7 +270,7 @@ public class MultipartReplyTranslatorTest {
     }
 
 
-    private MultipartReplyBody prepareMultipartReplyAggregate() {
+    private static MultipartReplyBody prepareMultipartReplyAggregate() {
         MultipartReplyAggregateBuilder multipartReplyAggregateBuilder = new MultipartReplyAggregateBuilder();
         multipartReplyAggregateBuilder.setByteCount(DUMMY_BYTE_COUNT);
         multipartReplyAggregateBuilder.setPacketCount(DUMMY_PACKET_COUNT);
@@ -282,7 +281,7 @@ public class MultipartReplyTranslatorTest {
         return multipartReplyAggregateCaseBuilder.build();
     }
 
-    private MultipartReplyBody prepareMultipartReplyFlow() {
+    private static MultipartReplyBody prepareMultipartReplyFlow() {
         MultipartReplyFlowCaseBuilder multipartReplyFlowCaseBuilder = new MultipartReplyFlowCaseBuilder();
         MultipartReplyFlowBuilder multipartReplyFlowBuilder = new MultipartReplyFlowBuilder();
         multipartReplyFlowBuilder.setFlowStats(Collections.emptyList());
@@ -290,8 +289,8 @@ public class MultipartReplyTranslatorTest {
         return multipartReplyFlowCaseBuilder.build();
     }
 
-    private MultipartReplyMessage prepareMocks(DeviceContext mockedDeviceContext,
-                                               MultipartReplyBody multipartReplyBody,
+    private static MultipartReplyMessage prepareMocks(final DeviceContext mockedDeviceContext,
+                                               final MultipartReplyBody multipartReplyBody,
                                                final MultipartType multipartType) {
         ConnectionContext mockedConnectionContext = mock(ConnectionContext.class);
         FeaturesReply mockedFeaturesReply = mock(FeaturesReply.class);
@@ -314,7 +313,7 @@ public class MultipartReplyTranslatorTest {
         return multipartReplyMessage;
     }
 
-    private DataContainer validateOutput(DataContainer dataObject) {
+    private static DataContainer validateOutput(final DataContainer dataObject) {
         return dataObject;
     }
 }