Bug 5540 - FlowConvertor, FlowStatsResponseConvertor, FlowInstructionResponseConvertor

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV13Test.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV13Test.java
index 503881d23ceca2d3c554b56464ca793e37868850..a26e3bc684dbe9dc67db85ec3428168bb5b218c3 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV13Test.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/action/ActionConvertorV13Test.java
@@ -20,6 +20,7 @@ import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;\r
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;\r
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionResponseConvertorData;\r
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.flow.FlowConvertorUtil;\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.Ipv4Prefix;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;\r
@@ -499,10 +500,7 @@ public class ActionConvertorV13Test {
 \r
         ActionConvertorData data = new ActionConvertorData(OFConstants.OFP_VERSION_1_3);\r
         data.setDatapathId(new BigInteger("42"));\r
-\r
-        if (flow.getMatch() != null && flow.getMatch().getIpMatch() != null) {\r
-            data.setIpProtocol(flow.getMatch().getIpMatch().getIpProtocol());\r
-        }\r
+        data.setIpProtocol(FlowConvertorUtil.getIpProtocolFromFlow(flow));\r
 \r
         Optional<List<Action>> actionsOptional = ConvertorManager.getInstance().convert(salActions, data);\r
         List<Action> actions = actionsOptional.orElse(Collections.emptyList());\r