EthernetType in PushVlaAction was not proper

[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 fd62d6c7435f3aba2c95f76c2fc08cb2e6460601..76d1ac6e74f7ae7dba011c14822446c912e899a7 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
@@ -6,36 +6,68 @@ import java.util.List;
 import org.opendaylight.controller.sal.core.NodeConnector.NodeConnectorIDType;
 import org.opendaylight.openflowjava.protocol.api.util.BinContent;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlIn;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlInBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlOut;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlOutBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecMplsTtl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecMplsTtlBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecNwTtlBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopMplsAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopMplsActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopPbbAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopPbbActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopVlanAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopVlanActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushMplsAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushMplsActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushPbbAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushPbbActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetField;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetMplsTtlAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetMplsTtlActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetQueueAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetQueueActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlInCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlInCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlOutCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlOutCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecMplsTtlCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecMplsTtlCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecNwTtlCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecNwTtlCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopMplsActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopMplsActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopPbbActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopPbbActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopVlanActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopVlanActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushMplsActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushMplsActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushPbbActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushPbbActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetMplsTtlActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetMplsTtlActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetQueueActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetQueueActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.copy.ttl.in._case.CopyTtlIn;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.copy.ttl.in._case.CopyTtlInBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.copy.ttl.out._case.CopyTtlOutBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.dec.mpls.ttl._case.DecMplsTtl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.dec.mpls.ttl._case.DecMplsTtlBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.dec.nw.ttl._case.DecNwTtl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.dec.nw.ttl._case.DecNwTtlBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.group.action._case.GroupAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.group.action._case.GroupActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.mpls.action._case.PopMplsAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.mpls.action._case.PopMplsActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.pbb.action._case.PopPbbAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.pbb.action._case.PopPbbActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.vlan.action._case.PopVlanAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.vlan.action._case.PopVlanActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.mpls.action._case.PushMplsAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.mpls.action._case.PushMplsActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.pbb.action._case.PushPbbAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.pbb.action._case.PushPbbActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.vlan.action._case.PushVlanAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.vlan.action._case.PushVlanActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.field._case.SetField;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.mpls.ttl.action._case.SetMplsTtlAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.mpls.ttl.action._case.SetMplsTtlActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.nw.ttl.action._case.SetNwTtlAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.nw.ttl.action._case.SetNwTtlActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.queue.action._case.SetQueueAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.queue.action._case.SetQueueActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeAction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeActionBuilder;
@@ -55,11 +87,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.QueueIdAction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.QueueIdActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecNwTtl;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Experimenter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Group;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopMpls;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopPbb;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopVlan;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushMpls;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushPbb;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushVlan;
@@ -100,7 +132,6 @@ public final class ActionConvertor {
             short version)
 
     {
-        ActionBuilder actionBuilder = new ActionBuilder();
         ActionsListBuilder actionsListBuilder = new ActionsListBuilder();
         List<ActionsList> actionsList = new ArrayList<ActionsList>();
 
@@ -109,42 +140,40 @@ public final class ActionConvertor {
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action = actions.get(
                     actionItem).getAction();
 
-            if (action instanceof OutputAction)
-                actionsList.add(salToOFOutputAction(action, actionBuilder, actionsListBuilder, version));
-            else if (action instanceof GroupAction)
-                actionsList.add(SalToOFGroupAction(action, actionBuilder, actionsListBuilder));
-            else if (action instanceof CopyTtlOut)
-                actionsList.add(SalToOFCopyTTLIOut(actionBuilder, actionsListBuilder));
-            else if (action instanceof CopyTtlIn)
-                actionsList.add(SalToOFCopyTTLIIn(actionBuilder, actionsListBuilder));
-            else if (action instanceof SetMplsTtlAction)
-                actionsList.add(SalToOFSetMplsTtl(action, actionBuilder, actionsListBuilder));
-            else if (action instanceof DecMplsTtl)
-                actionsList.add(SalToOFDecMplsTtl(actionBuilder, actionsListBuilder));
-            else if (action instanceof PushVlanAction)
-                actionsList.add(SalToOFPushVlanAction(action, actionBuilder, actionsListBuilder));
-            else if (action instanceof PopVlanAction)
-                actionsList.add(SalToOFPopVlan(action, actionBuilder, actionsListBuilder));
-            else if (action instanceof PushMplsAction)
-                actionsList.add(SalToOFPushMplsAction(action, actionBuilder, actionsListBuilder));
-            else if (action instanceof PopMplsAction)
-                actionsList.add(SalToOFPopMpls(action, actionBuilder, actionsListBuilder));
-            else if (action instanceof SetQueueAction)
-                actionsList.add(SalToOFSetQueue(action, actionBuilder, actionsListBuilder));
-
-            else if (action instanceof SetNwTtlAction)
-                actionsList.add(SalToOFSetNwTtl(action, actionBuilder, actionsListBuilder));
-            else if (action instanceof DecNwTtl)
-                actionsList.add(SalToOFDecNwTtl(action, actionBuilder, actionsListBuilder));
-            else if (action instanceof SetField)
-                actionsList.add(SalToOFSetField(action, actionBuilder, actionsListBuilder));
-
-            else if (action instanceof PushPbbAction)
-                actionsList.add(SalToOFPushPbbAction(action, actionBuilder, actionsListBuilder));
-            else if (action instanceof PopPbbAction)
-                actionsList.add(SalToOFPopPBB(action, actionBuilder, actionsListBuilder));
+            if (action instanceof OutputActionCase)
+                actionsList.add(salToOFOutputAction(action, actionsListBuilder, version));
+            else if (action instanceof GroupActionCase)
+                actionsList.add(SalToOFGroupAction(action, actionsListBuilder));
+            else if (action instanceof CopyTtlOutCase)
+                actionsList.add(SalToOFCopyTTLIOut(actionsListBuilder));
+            else if (action instanceof CopyTtlInCase)
+                actionsList.add(SalToOFCopyTTLIIn(actionsListBuilder));
+            else if (action instanceof SetMplsTtlActionCase)
+                actionsList.add(SalToOFSetMplsTtl(action, actionsListBuilder));
+            else if (action instanceof DecMplsTtlCase)
+                actionsList.add(SalToOFDecMplsTtl(actionsListBuilder));
+            else if (action instanceof PushVlanActionCase)
+                actionsList.add(SalToOFPushVlanAction(action, actionsListBuilder));
+            else if (action instanceof PopVlanActionCase)
+                actionsList.add(SalToOFPopVlan(action, actionsListBuilder));
+            else if (action instanceof PushMplsActionCase)
+                actionsList.add(SalToOFPushMplsAction(action, actionsListBuilder));
+            else if (action instanceof PopMplsActionCase)
+                actionsList.add(SalToOFPopMpls(action, actionsListBuilder));
+            else if (action instanceof SetQueueActionCase)
+                actionsList.add(SalToOFSetQueue(action, actionsListBuilder));
+            else if (action instanceof SetNwTtlActionCase)
+                actionsList.add(SalToOFSetNwTtl(action, actionsListBuilder));
+            else if (action instanceof DecNwTtlCase)
+                actionsList.add(SalToOFDecNwTtl(action, actionsListBuilder));
+            else if (action instanceof SetFieldCase)
+                actionsList.add(SalToOFSetField(action, actionsListBuilder));
+            else if (action instanceof PushPbbActionCase)
+                actionsList.add(SalToOFPushPbbAction(action, actionsListBuilder));
+            else if (action instanceof PopPbbActionCase)
+                actionsList.add(SalToOFPopPBB(action, actionsListBuilder));
             else if (action instanceof ExperimenterAction)
-                actionsList.add(SalToOFExperimenter(action, actionBuilder, actionsListBuilder));
+                actionsList.add(SalToOFExperimenter(action, actionsListBuilder));
 
         }
         return actionsList;
@@ -153,17 +182,17 @@ public final class ActionConvertor {
 
     private static ActionsList SalToOFSetField(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
+            ActionsListBuilder actionsListBuilder) {
 
-        org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetField setField = (org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetField) action;
-        org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match match = setField.getMatch();
+        SetFieldCase setFieldCase = (SetFieldCase) action;
+        org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match match = setFieldCase.getSetField();
 
-        List<MatchEntries> matchEntries = FlowConvertor.toMatch(match);
+        List<MatchEntries> matchEntries = MatchConvertor.toMatch(match);
 
         OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
 
         oxmFieldsActionBuilder.setMatchEntries(matchEntries);
-
+        ActionBuilder actionBuilder = new ActionBuilder();
         actionBuilder
                 .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
 
@@ -175,50 +204,54 @@ public final class ActionConvertor {
 
     private static ActionsList SalToOFDecNwTtl(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
-        actionBuilder.setType(DecNwTtl.class);
+            ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
+        actionBuilder.setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecNwTtl.class);
 
         return emtpyAction(actionBuilder, actionsListBuilder);
     }
 
     private static ActionsList SalToOFPushMplsAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
-
+            ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
+        PushMplsActionCase pushMplsActionCase = (PushMplsActionCase) action;
+        
         actionBuilder.setType(PushMpls.class);
 
-        return SalToOFPushAction(((PushMplsAction) action).getEthernetType(), actionBuilder, actionsListBuilder);
+        return SalToOFPushAction(pushMplsActionCase.getPushMplsAction().getEthernetType(), actionBuilder, actionsListBuilder);
 
     }
 
     private static ActionsList SalToOFPushPbbAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
+            ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
+        PushPbbActionCase pushPbbActionCase = (PushPbbActionCase) action;
         actionBuilder.setType(PushPbb.class);
 
-        return SalToOFPushAction(((PushPbbAction) action).getEthernetType(), actionBuilder, actionsListBuilder);
+        return SalToOFPushAction(pushPbbActionCase.getPushPbbAction().getEthernetType(), actionBuilder, actionsListBuilder);
     }
 
     private static ActionsList SalToOFPushVlanAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
-
-        PushVlanAction pushVlanAction = (PushVlanAction) action;
-        VlanId vlanId = new VlanId(pushVlanAction.getVlanId());
-        Integer etherType = vlanId.getValue();
+            ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
+        PushVlanActionCase pushVlanActionCase = (PushVlanActionCase) action;
+        PushVlanAction pushVlanAction = pushVlanActionCase.getPushVlanAction();
         actionBuilder.setType(PushVlan.class);
 
-        return SalToOFPushAction(etherType, actionBuilder, actionsListBuilder);
+        return SalToOFPushAction(pushVlanAction.getEthernetType(), actionBuilder, actionsListBuilder);
 
     }
 
     private static ActionsList SalToOFSetNwTtl(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
-
+            ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
+        SetNwTtlActionCase nwTtlActionCase = (SetNwTtlActionCase) action;
         NwTtlActionBuilder nwTtlActionBuilder = new NwTtlActionBuilder();
-        nwTtlActionBuilder.setNwTtl(((SetNwTtlAction) action).getNwTtl());
-
+        nwTtlActionBuilder.setNwTtl(nwTtlActionCase.getSetNwTtlAction().getNwTtl());
         actionBuilder.setType(SetNwTtl.class);
         actionBuilder.addAugmentation(NwTtlAction.class, nwTtlActionBuilder.build());
         actionsListBuilder.setAction(actionBuilder.build());
@@ -228,9 +261,10 @@ public final class ActionConvertor {
 
     private static ActionsList SalToOFSetQueue(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
-
-        SetQueueAction setQueueAction = (SetQueueAction) action;
+            ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
+        SetQueueActionCase setQueueActionCase = (SetQueueActionCase) action;
+        SetQueueAction setQueueAction = setQueueActionCase.getSetQueueAction();
 
         QueueIdActionBuilder queueIdActionBuilder = new QueueIdActionBuilder();
         queueIdActionBuilder.setQueueId(Long.getLong(setQueueAction.getQueue()));
@@ -243,33 +277,36 @@ public final class ActionConvertor {
 
     private static ActionsList SalToOFPopMpls(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
-
+            ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
+        PopMplsActionCase popMplsActionCase = (PopMplsActionCase) action;
         actionBuilder.setType(PopMpls.class);
 
-        return SalToOFPushAction(((PopMplsAction) action).getEthernetType(), actionBuilder, actionsListBuilder);
+        return SalToOFPushAction(popMplsActionCase.getPopMplsAction().getEthernetType(), actionBuilder, actionsListBuilder);
     }
 
     private static ActionsList SalToOFPopVlan(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
-
-        actionBuilder.setType(PushMpls.class);
+            ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
+        actionBuilder.setType(PopVlan.class);
 
         return emtpyAction(actionBuilder, actionsListBuilder);
     }
 
     private static ActionsList SalToOFPopPBB(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
+            ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
         actionBuilder.setType(PopPbb.class);
         return emtpyAction(actionBuilder, actionsListBuilder);
     }
 
     private static ActionsList SalToOFExperimenter(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
+            ActionsListBuilder actionsListBuilder) {
 
+        ActionBuilder actionBuilder = new ActionBuilder();
         ExperimenterActionBuilder experimenterActionBuilder = new ExperimenterActionBuilder();
         experimenterActionBuilder.setExperimenter(((ExperimenterAction) action).getExperimenter());
         actionBuilder.setType(Experimenter.class);
@@ -284,12 +321,14 @@ public final class ActionConvertor {
 
     private static ActionsList SalToOFGroupAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
+            ActionsListBuilder actionsListBuilder) {
 
-        GroupAction groupAction = (GroupAction) action;
+        GroupActionCase groupActionCase = (GroupActionCase) action;
+        GroupAction groupAction = groupActionCase.getGroupAction();
 
         GroupIdActionBuilder groupIdBuilder = new GroupIdActionBuilder();
         groupIdBuilder.setGroupId(Long.getLong(groupAction.getGroup()));
+        ActionBuilder actionBuilder = new ActionBuilder();
         actionBuilder.setType(Group.class);
         actionBuilder.addAugmentation(GroupIdAction.class, groupIdBuilder.build());
         actionsListBuilder.setAction(actionBuilder.build());
@@ -308,7 +347,8 @@ public final class ActionConvertor {
         return actionsListBuilder.build();
     }
 
-    private static ActionsList SalToOFDecMplsTtl(ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
+    private static ActionsList SalToOFDecMplsTtl(ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
         actionBuilder
                 .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecMplsTtl.class);
         return emtpyAction(actionBuilder, actionsListBuilder);
@@ -316,9 +356,12 @@ public final class ActionConvertor {
 
     private static ActionsList SalToOFSetMplsTtl(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
+            ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
 
-        SetMplsTtlAction mplsTtlAction = (SetMplsTtlAction) action;
+        SetMplsTtlActionCase mplsTtlActionCase = (SetMplsTtlActionCase) action;
+        SetMplsTtlAction mplsTtlAction = mplsTtlActionCase.getSetMplsTtlAction();
+        
 
         MplsTtlActionBuilder mplsTtlActionBuilder = new MplsTtlActionBuilder();
         mplsTtlActionBuilder.setMplsTtl(mplsTtlAction.getMplsTtl()/* SAL */);
@@ -329,13 +372,15 @@ public final class ActionConvertor {
         return actionsListBuilder.build();
     }
 
-    private static ActionsList SalToOFCopyTTLIIn(ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
+    private static ActionsList SalToOFCopyTTLIIn(ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
         actionBuilder
                 .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlIn.class);
         return emtpyAction(actionBuilder, actionsListBuilder);
     }
 
-    private static ActionsList SalToOFCopyTTLIOut(ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder) {
+    private static ActionsList SalToOFCopyTTLIOut(ActionsListBuilder actionsListBuilder) {
+        ActionBuilder actionBuilder = new ActionBuilder();
         actionBuilder
                 .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlOut.class);
         return emtpyAction(actionBuilder, actionsListBuilder);
@@ -350,13 +395,14 @@ public final class ActionConvertor {
 
     private static ActionsList salToOFOutputAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
-            ActionBuilder actionBuilder, ActionsListBuilder actionsListBuilder, short version) {
+            ActionsListBuilder actionsListBuilder, short version) {
 
-        OutputAction outputAction = ((OutputAction) action);
+        OutputActionCase outputActionCase = ((OutputActionCase) action);
+        OutputAction outputAction = outputActionCase.getOutputAction();
         PortActionBuilder portAction = new PortActionBuilder();
         MaxLengthActionBuilder maxLenActionBuilder = new MaxLengthActionBuilder();
         maxLenActionBuilder.setMaxLength(outputAction.getMaxLength());
-
+        ActionBuilder actionBuilder = new ActionBuilder();
         actionBuilder.addAugmentation(MaxLengthAction.class, maxLenActionBuilder.build());
 
         Uri uri = outputAction.getOutputNodeConnector();
@@ -389,7 +435,7 @@ public final class ActionConvertor {
                 || (uri.getValue() == NodeConnectorIDType.PCEP2OPENFLOW)
                 || (uri.getValue() == NodeConnectorIDType.PRODUCTION)) {
             if (version >= OF13) {
-                portAction.setPort(new PortNumber((long) PortNumberValuesV10.NORMAL.getIntValue()));
+                portAction.setPort(new PortNumber(BinContent.intToUnsignedLong(PortNumberValues.NORMAL.getIntValue())));
 
             } else if (version == OF10) {
                 portAction.setPort(new PortNumber((long) PortNumberValuesV10.NORMAL.getIntValue()));
@@ -425,58 +471,64 @@ public final class ActionConvertor {
             List<ActionsList> actionList) {
 
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> bucketActions = new ArrayList<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action>();
-
         for (ActionsList actionDesc : actionList) {
 
             org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action = actionDesc
                     .getAction();
 
-            if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output)
+            if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output.class))
                 bucketActions.add(ofToSALOutputAction(action));
-            else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Group)
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Group.class))
                 bucketActions.add(ofToSALGroupAction(action));
-            else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlOut) {
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlOut.class)){
                 CopyTtlOutBuilder copyTtlOutaction = new CopyTtlOutBuilder();
-                bucketActions.add(copyTtlOutaction.build());
-            } else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlIn) {
+                bucketActions.add(new CopyTtlOutCaseBuilder().setCopyTtlOut(copyTtlOutaction.build()).build());
+            }
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlIn.class)){
                 CopyTtlInBuilder copyTtlInaction = new CopyTtlInBuilder();
-                bucketActions.add(copyTtlInaction.build());
-            } else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetMplsTtl)
+                bucketActions.add(new CopyTtlInCaseBuilder().setCopyTtlIn(copyTtlInaction.build()).build());
+            }
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetMplsTtl.class))
                 bucketActions.add(ofToSALSetMplsTtl(action));
-            else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecMplsTtl) {
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecMplsTtl.class)){
                 DecMplsTtlBuilder decMplsTtl = new DecMplsTtlBuilder();
-                bucketActions.add(decMplsTtl.build());
-            } else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushVlan)
+                bucketActions.add(new DecMplsTtlCaseBuilder().setDecMplsTtl(decMplsTtl.build()).build());
+            }
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushVlan.class))
                 bucketActions.add(ofToSALPushVlanAction(action));
-            else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopVlan) {
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopVlan.class)){
                 PopVlanActionBuilder popVlan = new PopVlanActionBuilder();
-                bucketActions.add(popVlan.build());
-            } else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushMpls) {
+                bucketActions.add(new PopVlanActionCaseBuilder().setPopVlanAction(popVlan.build()).build());
+            }
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushMpls.class)){
                 PushMplsActionBuilder pushMpls = new PushMplsActionBuilder();
-                bucketActions.add(pushMpls.build());
-            } else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopMpls) {
+                bucketActions.add(new PushMplsActionCaseBuilder().setPushMplsAction(pushMpls.build()).build());
+            }
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopMpls.class)){
                 PopMplsActionBuilder popMpls = new PopMplsActionBuilder();
-                bucketActions.add(popMpls.build());
-            } else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetQueue)
+                bucketActions.add(new PopMplsActionCaseBuilder().setPopMplsAction(popMpls.build()).build());
+            }
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetQueue.class))
                 bucketActions.add(ofToSALSetQueue(action));
 
-            else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetNwTtl)
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetNwTtl.class))
                 bucketActions.add(ofToSALSetNwTtl(action));
-            else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecNwTtl) {
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecNwTtl.class)){
                 DecNwTtlBuilder decNwTtl = new DecNwTtlBuilder();
-                bucketActions.add(decNwTtl.build());
-            } else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField)
-                bucketActions.add(FlowConvertor.ofToSALSetField(action));
+                bucketActions.add(new DecNwTtlCaseBuilder().setDecNwTtl(decNwTtl.build()).build());
+            }
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class))
+                bucketActions.add(new SetFieldCaseBuilder().setSetField(MatchConvertor.ofToSALSetField(action)).build());
 
-            else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushPbb)
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushPbb.class))
                 bucketActions.add(ofToSALPushPbbAction(action));
-            else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopPbb) {
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopPbb.class)){
                 PopPbbActionBuilder popPbb = new PopPbbActionBuilder();
-                bucketActions.add(popPbb.build());
-            } else if (action instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Experimenter) {
-                // bucketActions.add(ofToSALExperimenter(action));
-                // TODO: Need to explore/discuss on how to handle experimenter
-                // case.
+                bucketActions.add(new PopPbbActionCaseBuilder().setPopPbbAction(popPbb.build()).build());
+            }
+            else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Experimenter.class)){
+                //bucketActions.add(ofToSALExperimenter(action));
+                // TODO: Need to explore/discuss on how to handle experimenter case.
             }
 
         }
@@ -491,7 +543,7 @@ public final class ActionConvertor {
      *            action.rev130731.actions.actions.list.Action
      * @return OutputAction
      */
-    public static OutputAction ofToSALOutputAction(
+    public static OutputActionCase ofToSALOutputAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) {
 
         OutputActionBuilder outputAction = new OutputActionBuilder();
@@ -509,7 +561,7 @@ public final class ActionConvertor {
             logger.error("Provided action is not OF Output action, no associated length found!");
         }
 
-        return outputAction.build();
+        return new OutputActionCaseBuilder().setOutputAction(outputAction.build()).build();
     }
 
     /**
@@ -518,7 +570,7 @@ public final class ActionConvertor {
      * @param action
      * @return GroupAction
      */
-    public static GroupAction ofToSALGroupAction(
+    public static GroupActionCase ofToSALGroupAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) {
 
         GroupActionBuilder groupAction = new GroupActionBuilder();
@@ -526,7 +578,7 @@ public final class ActionConvertor {
         GroupIdAction groupId = action.getAugmentation(GroupIdAction.class);
         groupAction.setGroupId(groupId.getGroupId());
 
-        return groupAction.build();
+        return new GroupActionCaseBuilder().setGroupAction(groupAction.build()).build();
     }
 
     /**
@@ -536,13 +588,13 @@ public final class ActionConvertor {
      * @param action
      * @return
      */
-    public static SetMplsTtlAction ofToSALSetMplsTtl(
+    public static SetMplsTtlActionCase ofToSALSetMplsTtl(
             org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) {
 
         SetMplsTtlActionBuilder mplsTtlAction = new SetMplsTtlActionBuilder();
         MplsTtlAction mplsTtl = action.getAugmentation(MplsTtlAction.class);
         mplsTtlAction.setMplsTtl(mplsTtl.getMplsTtl());
-        return mplsTtlAction.build();
+        return new SetMplsTtlActionCaseBuilder().setSetMplsTtlAction(mplsTtlAction.build()).build();
     }
 
     /**
@@ -551,7 +603,7 @@ public final class ActionConvertor {
      * @param action
      * @return PushVlanAction
      */
-    public static PushVlanAction ofToSALPushVlanAction(
+    public static PushVlanActionCase ofToSALPushVlanAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) {
 
         PushVlanActionBuilder pushVlanAction = new PushVlanActionBuilder();
@@ -559,7 +611,7 @@ public final class ActionConvertor {
         EthertypeAction etherType = action.getAugmentation(EthertypeAction.class);
         pushVlanAction.setVlanId(new VlanId(etherType.getEthertype().getValue()));
 
-        return pushVlanAction.build();
+        return new PushVlanActionCaseBuilder().setPushVlanAction(pushVlanAction.build()).build();
     }
 
     /**
@@ -568,7 +620,7 @@ public final class ActionConvertor {
      * @param action
      * @return SetQueueAction
      */
-    public static SetQueueAction ofToSALSetQueue(
+    public static SetQueueActionCase ofToSALSetQueue(
             org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) {
 
         SetQueueActionBuilder setQueueAction = new SetQueueActionBuilder();
@@ -576,7 +628,7 @@ public final class ActionConvertor {
         QueueIdAction queueId = action.getAugmentation(QueueIdAction.class);
         setQueueAction.setQueueId(queueId.getQueueId());
 
-        return setQueueAction.build();
+        return new SetQueueActionCaseBuilder().setSetQueueAction(setQueueAction.build()).build();
     }
 
     /**
@@ -585,14 +637,14 @@ public final class ActionConvertor {
      * @param action
      * @return SetNwTtlAction
      */
-    public static SetNwTtlAction ofToSALSetNwTtl(
+    public static SetNwTtlActionCase ofToSALSetNwTtl(
             org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) {
 
         SetNwTtlActionBuilder setNwTtl = new SetNwTtlActionBuilder();
         NwTtlAction nwTtl = action.getAugmentation(NwTtlAction.class);
         setNwTtl.setNwTtl(nwTtl.getNwTtl());
 
-        return setNwTtl.build();
+        return new SetNwTtlActionCaseBuilder().setSetNwTtlAction(setNwTtl.build()).build();
     }
 
     /**
@@ -601,7 +653,7 @@ public final class ActionConvertor {
      * @param action
      * @return PushVlanAction
      */
-    public static PushPbbAction ofToSALPushPbbAction(
+    public static PushPbbActionCase ofToSALPushPbbAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action action) {
 
         PushPbbActionBuilder pushPbbAction = new PushPbbActionBuilder();
@@ -609,7 +661,7 @@ public final class ActionConvertor {
         EthertypeAction etherType = action.getAugmentation(EthertypeAction.class);
         pushPbbAction.setEthernetType(etherType.getEthertype().getValue());
 
-        return pushPbbAction.build();
+        return new PushPbbActionCaseBuilder().setPushPbbAction(pushPbbAction.build()).build();
     }
 
     public static Object ofToSALExperimenter(