Bump mdsal to 5.0.2

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / PacketOutConvertorTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
index cab39ef81f4108d1ab5609a6337f67f62f7cc95f..7a78c11c207e742e6e0ed2bc68a599286a76a9a5 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
@@ -44,6 +44,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Co
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInputBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * Created by Jakub Toth jatoth@cisco.com on 9/23/14.
@@ -98,7 +101,7 @@ public class PacketOutConvertorTest {
 
         Assert.assertEquals(OFConstants.OFP_NO_BUFFER, message.getBufferId());
         Assert.assertEquals(new PortNumber(0xfffffffdL), message.getInPort());
-        Assert.assertEquals(version, message.getVersion());
+        Assert.assertEquals(Uint8.valueOf(version), message.getVersion());
         Assert.assertEquals(xid, message.getXid());
         Assert.assertArrayEquals(transmitPacketInput.getPayload(), message.getData());
     }
@@ -164,8 +167,8 @@ public class PacketOutConvertorTest {
         for (int i = 0; i < datapathIdByte.length; i++) {
             datapathIdByte[i] = 1;
         }
-        BigInteger datapathId = new BigInteger(1, datapathIdByte);
-        Long xid = 0xfffffL;
+        Uint64 datapathId = Uint64.valueOf(new BigInteger(1, datapathIdByte));
+        Uint32 xid = Uint32.valueOf(0xfffffL);
 
         XidConvertorData data = new XidConvertorData(version);
         data.setXid(xid);
@@ -173,8 +176,8 @@ public class PacketOutConvertorTest {
         PacketOutInput message = convert(transmitPacketInput, data);
 
         Assert.assertEquals(transmitPacketInput.getBufferId(), message.getBufferId());
-        Assert.assertEquals(Long.valueOf(inPort), message.getInPort().getValue());
-        Assert.assertEquals(version, message.getVersion());
+        Assert.assertEquals(Uint32.valueOf(inPort), message.getInPort().getValue());
+        Assert.assertEquals(Uint8.valueOf(version), message.getVersion());
         Assert.assertEquals(xid, message.getXid());
 
         ActionConvertorData actionConvertorData = new ActionConvertorData(version);
@@ -214,7 +217,7 @@ public class PacketOutConvertorTest {
     }
 
     private static PortNumber getPortNumber(final NodeConnectorKey nodeConKey, final Short ofVersion) {
-        Long port = InventoryDataServiceUtil.portNumberfromNodeConnectorId(OpenflowVersion.get(ofVersion),
+        Uint32 port = InventoryDataServiceUtil.portNumberfromNodeConnectorId(OpenflowVersion.get(ofVersion),
                 nodeConKey.getId());
         return new PortNumber(port);
     }
@@ -244,7 +247,7 @@ public class PacketOutConvertorTest {
         return new NodeRef(path);
     }
 
-    private PacketOutInput convert(TransmitPacketInput transmitPacketInput, XidConvertorData data) {
+    private PacketOutInput convert(final TransmitPacketInput transmitPacketInput, final XidConvertorData data) {
         Optional<PacketOutInput> messageOptional = convertorManager.convert(transmitPacketInput, data);
         return messageOptional.orElse(PacketOutConvertor.defaultResult(data.getVersion()));
     }