Bug 5540 - ConvertorManager base

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

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java
index 8d55f55dd874b8a1f11af7371c6eada3891decf4..366b61a37cc434b85283a496a1e32bef8b8a52e1 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java
@@ -21,6 +21,7 @@ import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
 import org.opendaylight.openflowplugin.openflow.md.core.extension.ActionExtensionHelper;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ActionSetNwDstReactor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.ActionSetNwSrcReactor;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.IPProtocols;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.OrderComparator;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.MatchConvertorImpl;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.MatchReactor;
@@ -345,7 +346,7 @@ public final class ActionConvertor {
         } else {
             SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
             SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
-            MatchReactor.getInstance().convert(match, version, setFieldBuilder, datapathid);
+            MatchReactor.getInstance().convert(match, version, setFieldBuilder);
             setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
             actionBuilder.setActionChoice(setFieldCaseBuilder.build());
 
@@ -643,7 +644,7 @@ public final class ActionConvertor {
             final ActionBuilder actionBuilder, final short version) {
 
         try {
-            ActionSetNwSrcReactor.getInstance().convert((SetNwSrcActionCase) action, version, actionBuilder, null);
+            ActionSetNwSrcReactor.getInstance().convert((SetNwSrcActionCase) action, version, actionBuilder);
         } catch (Exception e) {
             LOG.error(e.getMessage(), e);
             return null;
@@ -657,7 +658,7 @@ public final class ActionConvertor {
             final ActionBuilder actionBuilder, final short version) {
 
         try {
-            ActionSetNwDstReactor.getInstance().convert((SetNwDstActionCase) action, version, actionBuilder, null);
+            ActionSetNwDstReactor.getInstance().convert((SetNwDstActionCase) action, version, actionBuilder);
         } catch (Exception e) {
             LOG.error(e.getMessage(), e);
             return null;