Bug 5540 - PacketOutConvertor

[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 c5ef62043e25cad4625febab95428e0de91f79c3..cce8c34e94fc046b575d20986d58bdd77347ecbc 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
@@ -20,6 +20,7 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowplugin.api.OFConstants;\r
 import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;\r
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;\r
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.PacketOutConvertorData;\r
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;\r
 import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;\r
@@ -86,13 +87,12 @@ public class PacketOutConvertorTest {
 \r
         Short version = (short) 0x04;\r
         Long xid = null;\r
-        PacketOutInput message = PacketOutConvertor.toPacketOutInput(\r
-                transmitPacketInput, version, null, null);\r
+        PacketOutConvertorData data = new PacketOutConvertorData(version);\r
+        PacketOutInput message = convert(transmitPacketInput, data);\r
 \r
         //FIXME : this has to be fixed along with actions changed in openflowjava\r
 \r
-        Assert.assertEquals(PacketOutConvertorTest.buildActionForNullTransmitPacketInputAction(nodeConnKey,\r
-                version), message.getAction());\r
+        Assert.assertEquals(buildActionForNullTransmitPacketInputAction(nodeConnKey, version), message.getAction());\r
 \r
         Assert.assertEquals(OFConstants.OFP_NO_BUFFER, message.getBufferId());\r
         Assert.assertEquals(new PortNumber(0xfffffffdL), message.getInPort());\r
@@ -166,8 +166,10 @@ public class PacketOutConvertorTest {
 \r
         OpenflowPortsUtil.init();\r
 \r
-        PacketOutInput message = PacketOutConvertor.toPacketOutInput(\r
-                transmitPacketInput, version, xid, datapathId);\r
+        PacketOutConvertorData data = new PacketOutConvertorData(version);\r
+        data.setXid(xid);\r
+        data.setDatapathId(datapathId);\r
+        PacketOutInput message = convert(transmitPacketInput, data);\r
 \r
         Assert.assertEquals(transmitPacketInput.getBufferId(),\r
                 message.getBufferId());\r
@@ -176,6 +178,7 @@ public class PacketOutConvertorTest {
         Assert.assertEquals((Object) version,\r
                 Short.valueOf(message.getVersion()));\r
         Assert.assertEquals(xid, message.getXid());\r
+\r
         ActionConvertorData actionConvertorData = new ActionConvertorData(version);\r
         actionConvertorData.setDatapathId(datapathId);\r
 \r
@@ -277,4 +280,9 @@ public class PacketOutConvertorTest {
                 .<Node, NodeKey>child(Node.class, key).build();\r
         return new NodeRef(path);\r
     }\r
+\r
+    private PacketOutInput convert(TransmitPacketInput transmitPacketInput, PacketOutConvertorData data) {\r
+        Optional<PacketOutInput> messageOptional = ConvertorManager.getInstance().convert(transmitPacketInput, data);\r
+        return messageOptional.orElse(PacketOutConvertor.defaultResult(data.getVersion()));\r
+    }\r
 }\r