Update MRI upstreams for Phosphorus

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / PacketOutConvertor.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java
index fe0d0621d2e367e663252dcf1b855a43e4747dc4..a11138fc2d89103fd86350fe053e164cf198a87b 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertor.java
@@ -34,6 +34,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Tr
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.IdentifiableItem;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -63,13 +64,13 @@ public class PacketOutConvertor extends Convertor<TransmitPacketInput, PacketOut
      * @param version Openflow version
      * @return default empty meter mod input builder
      */
-    public static PacketOutInput defaultResult(final short version) {
+    public static PacketOutInput defaultResult(final Uint8 version) {
         return new PacketOutInputBuilder()
                 .setVersion(version)
                 .build();
     }
 
-    private static PortNumber getPortNumber(final PathArgument pathArgument, final Short ofVersion) {
+    private static PortNumber getPortNumber(final PathArgument pathArgument, final Uint8 ofVersion) {
         checkArgument(pathArgument instanceof IdentifiableItem, "Unexpected path argument %s", pathArgument);
 
         // FIXME VD P! find InstanceIdentifier helper