External api proposal
[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / ActionConvertor.java
index 0859133c3dd696cd05b8ed5274c045e2620a53f4..3ae9aec9a781bf8ab7a03de067c850cee71f25ca 100644 (file)
@@ -9,14 +9,19 @@
  */
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor;
 
-import com.google.common.collect.Ordering;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
 
+import com.google.common.collect.Ordering;
+import org.opendaylight.openflowjava.util.ByteBufUtils;
+import org.opendaylight.openflowplugin.api.OFConstants;
+import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.openflowplugin.extension.api.ConverterExtensionKey;
 import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava;
 import org.opendaylight.openflowplugin.extension.api.ConvertorToOFJava;
 import org.opendaylight.openflowplugin.extension.api.TypeVersionKey;
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
-import org.opendaylight.openflowplugin.api.OFConstants;
 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;
@@ -27,21 +32,15 @@ import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
 import org.opendaylight.openflowplugin.openflow.md.util.ActionUtil;
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
 import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
-import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Dscp;
 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.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;
@@ -57,10 +56,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetDlDstActionCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetDlSrcActionCase;
 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.SetNwDstActionCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwDstActionCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwSrcActionCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTosActionCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlActionCase;
@@ -77,102 +76,115 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti
 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.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.PopMplsActionBuilder;
 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.PopVlanActionBuilder;
-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.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.dl.dst.action._case.SetDlDstAction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.dl.src.action._case.SetDlSrcAction;
 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.tos.action._case.SetNwTosAction;
-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.action.types.rev131112.action.action.set.tp.dst.action._case.SetTpDstAction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.tp.src.action._case.SetTpSrcAction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.vlan.id.action._case.SetVlanIdAction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.vlan.pcp.action._case.SetVlanPcpAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.CommonPort;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortNumberUni;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.DlAddressAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.DlAddressActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.GroupIdAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.GroupIdActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv4CodeMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv4CodeMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv4TypeMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv4TypeMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv6CodeMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv6CodeMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv6TypeMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv6TypeMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaxLengthAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaxLengthActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MplsTtlAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MplsTtlActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.NwTosAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.NwTosActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.NwTtlAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.NwTtlActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.OxmFieldsAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.OxmFieldsActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortMatchEntryBuilder;
-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.augments.rev131002.VlanPcpAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanPcpActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidMatchEntryBuilder;
-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;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetMplsTtl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetNwTtl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetQueue;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.action.container.action.choice.ExperimenterIdCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlInCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlOutCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.DecMplsTtlCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.DecNwTtlCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.GroupCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.GroupCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.OutputActionCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopMplsCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopPbbCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopVlanCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushMplsCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushPbbCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushVlanCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetDlDstCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetDlSrcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetMplsTtlCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetMplsTtlCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwTosCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwTtlCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetQueueCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetTpDstCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetTpSrcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetVlanPcpCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetVlanVidCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.StripVlanCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.group._case.GroupActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.output.action._case.OutputActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.pop.mpls._case.PopMplsAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.pop.mpls._case.PopMplsActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.push.mpls._case.PushMplsAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.push.mpls._case.PushMplsActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.push.pbb._case.PushPbbAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.push.pbb._case.PushPbbActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.push.vlan._case.PushVlanActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.dl.dst._case.SetDlDstActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.dl.src._case.SetDlSrcActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.field._case.SetFieldActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.mpls.ttl._case.SetMplsTtlActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.nw.dst._case.SetNwDstActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.nw.tos._case.SetNwTosActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.nw.ttl._case.SetNwTtlAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.nw.ttl._case.SetNwTtlActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.queue._case.SetQueueActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.tp.dst._case.SetTpDstActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.tp.src._case.SetTpSrcActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.vlan.pcp._case.SetVlanPcpActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.vlan.vid._case.SetVlanVidActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.EtherType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.EthDst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.EthSrc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Icmpv4Code;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Icmpv4Type;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Icmpv6Code;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Icmpv6Type;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OpenflowBasicClass;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.TcpDst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.TcpSrc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.UdpDst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.UdpSrc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.VlanVid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntriesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthDst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthSrc;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Icmpv4Type;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Icmpv6Code;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Icmpv6Type;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OpenflowBasicClass;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpDst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpSrc;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.UdpDst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.UdpSrc;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.EthDstCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.EthSrcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Icmpv4CodeCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Icmpv4TypeCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Icmpv6CodeCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Icmpv6TypeCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.InPortCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.TcpDstCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.TcpSrcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.UdpSrcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.VlanVidCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.eth.dst._case.EthDstBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.eth.src._case.EthSrcBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.icmpv4.code._case.Icmpv4CodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.icmpv4.type._case.Icmpv4TypeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.icmpv6.code._case.Icmpv6CodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.icmpv6.type._case.Icmpv6TypeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.tcp.dst._case.TcpDstBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.tcp.src._case.TcpSrcBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.udp.src._case.UdpSrcBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.vlan.vid._case.VlanVidBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.GeneralExtensionGrouping;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
+
+import com.google.common.collect.Ordering;
 
 /**
  * @author usha@ericsson Action List:This class takes data from SAL layer and
@@ -183,7 +195,7 @@ import java.util.List;
 public final class ActionConvertor {
     private static final Logger LOG = LoggerFactory.getLogger(ActionConvertor.class);
     private static final String UNKNOWN_ACTION_TYPE_VERSION = "Unknown Action Type for the Version";
-    
+
     private ActionConvertor() {
         // NOOP
     }
@@ -194,7 +206,7 @@ public final class ActionConvertor {
      * @param actions    SAL actions
      * @param version    Openflow protocol version used
      * @param datapathid
-     * @param flow TODO
+     * @param flow       TODO
      * @return OF Library actions
      */
     public static List<Action> getActions(
@@ -203,9 +215,9 @@ public final class ActionConvertor {
         List<Action> actionsList = new ArrayList<>();
         Action ofAction;
 
-        final List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action> sortedActions = 
+        final List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action> sortedActions =
                 Ordering.from(OrderComparator.<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action>build())
-            .sortedCopy(actions);
+                        .sortedCopy(actions);
 
         for (int actionItem = 0; actionItem < sortedActions.size(); actionItem++) {
             ofAction = null;
@@ -215,7 +227,7 @@ public final class ActionConvertor {
                     actionItem).getAction();
 
             if (action instanceof OutputActionCase) {
-                ofAction = salToOFAction((OutputActionCase)action, actionBuilder, version);
+                ofAction = salToOFAction((OutputActionCase) action, actionBuilder, version);
             } else if (action instanceof GroupActionCase) {
                 ofAction = salToOFGroupAction(action, actionBuilder);
             } else if (action instanceof CopyTtlOutCase) {
@@ -230,7 +242,7 @@ public final class ActionConvertor {
                 ofAction = salToOFPushVlanAction(action, actionBuilder, version);
             } else if (action instanceof PopVlanActionCase) {
                 ofAction = (version == OFConstants.OFP_VERSION_1_0) ?
-                    salToOFStripVlan(actionBuilder, version)
+                        salToOFStripVlan(actionBuilder, version)
                         : salToOFPopVlan(actionBuilder);
             } else if (action instanceof PushMplsActionCase) {
                 ofAction = salToOFPushMplsAction(action, actionBuilder);
@@ -243,7 +255,7 @@ public final class ActionConvertor {
             } else if (action instanceof DecNwTtlCase) {
                 ofAction = salToOFDecNwTtl(actionBuilder);
             } else if (action instanceof SetFieldCase) {
-                ofAction = salToOFSetField(action, actionBuilder, version, datapathid); 
+                ofAction = salToOFSetField(action, actionBuilder, version, datapathid);
             } else if (action instanceof PushPbbActionCase) {
                 ofAction = salToOFPushPbbAction(action, actionBuilder);
             } else if (action instanceof PopPbbActionCase) {
@@ -251,12 +263,6 @@ public final class ActionConvertor {
 
                 // 1.0 Actions
             } else if (action instanceof SetVlanIdActionCase) {
-                /*if (version == OFConstants.OFP_VERSION_1_0) {
-
-                } else {
-                    List<Action> setVlanIdActionsList = convertToOF13(action, actionBuilder);
-                    actionsList.addAll(setVlanIdActionsList);
-                }*/
                 ofAction = salToOFSetVlanId(action, actionBuilder, version);
             } else if (action instanceof SetVlanPcpActionCase) {
                 ofAction = salToOFSetVlanpcp(action, actionBuilder, version);
@@ -279,17 +285,17 @@ public final class ActionConvertor {
             } else if (action instanceof SetNwTosActionCase) {
                 ofAction = salToOFSetNwTos(action, actionBuilder, version);
             } else if (action instanceof GeneralExtensionGrouping) {
-                
+
                 /**
                  * TODO: EXTENSION PROPOSAL (action, MD-SAL to OFJava)
                  * - we might need sessionContext as converter input
-                 * 
+                 *
                  */
-                
+
                 GeneralExtensionGrouping extensionCaseGrouping = (GeneralExtensionGrouping) action;
                 Extension extAction = extensionCaseGrouping.getExtension();
                 ConverterExtensionKey<? extends ExtensionKey> key = new ConverterExtensionKey<>(extensionCaseGrouping.getExtensionKey(), version);
-                ConvertorToOFJava<Action> convertor = 
+                ConvertorToOFJava<Action> convertor =
                         OFSessionUtil.getExtensionConvertorProvider().getConverter(key);
                 if (convertor != null) {
                     ofAction = convertor.convert(extAction);
@@ -300,13 +306,13 @@ public final class ActionConvertor {
                         new TypeVersionKey<>(
                                 (Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action>) action.getImplementedInterface(),
                                 version);
-                ConvertorActionToOFJava<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, Action> convertor = 
+                ConvertorActionToOFJava<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, Action> convertor =
                         OFSessionUtil.getExtensionConvertorProvider().getConverter(key);
                 if (convertor != null) {
                     ofAction = convertor.convert(action);
                 }
             }
-            
+
             if (ofAction != null) {
                 actionsList.add(ofAction);
             }
@@ -320,37 +326,35 @@ public final class ActionConvertor {
 
         SetFieldCase setFieldCase = (SetFieldCase) action;
         org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match match =
-            setFieldCase.getSetField();
+                setFieldCase.getSetField();
 
         if (version == OFConstants.OFP_VERSION_1_0) {
             // pushvlan +setField can be called to configure 1.0 switches via MDSAL app
             if (match.getVlanMatch() != null) {
-                VlanVidActionBuilder vlanidActionBuilder = new VlanVidActionBuilder();
+                SetVlanVidActionBuilder vlanidActionBuilder = new SetVlanVidActionBuilder();
+                SetVlanVidCaseBuilder setVlanVidCaseBuilder = new SetVlanVidCaseBuilder();
                 vlanidActionBuilder.setVlanVid(match.getVlanMatch().getVlanId().getVlanId().getValue());
-                actionBuilder.setType(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetVlanVid.class);
-                actionBuilder.addAugmentation(VlanVidAction.class, vlanidActionBuilder.build());
+                setVlanVidCaseBuilder.setSetVlanVidAction(vlanidActionBuilder.build());
+
+                actionBuilder.setActionChoice(setVlanVidCaseBuilder.build());
                 return actionBuilder.build();
             } else {
                 return emtpyAction(actionBuilder);
             }
 
         } else {
-            OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
-            MatchReactor.getInstance().convert(match, version, oxmFieldsActionBuilder, datapathid);
+            SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
+            SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
+            MatchReactor.getInstance().convert(match, version, setFieldBuilder, datapathid);
+            setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
+            actionBuilder.setActionChoice(setFieldCaseBuilder.build());
 
-            actionBuilder.setType(
-                org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
-
-            actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
             return actionBuilder.build();
         }
-
     }
 
     private static Action salToOFDecNwTtl(ActionBuilder actionBuilder) {
-        actionBuilder
-                .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecNwTtl.class);
+        actionBuilder.setActionChoice(new DecNwTtlCaseBuilder().build());
         return emtpyAction(actionBuilder);
     }
 
@@ -358,18 +362,24 @@ public final class ActionConvertor {
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
             ActionBuilder actionBuilder) {
         PushMplsActionCase pushMplsActionCase = (PushMplsActionCase) action;
-        actionBuilder.setType(PushMpls.class);
-
-        return salToOFPushAction(pushMplsActionCase.getPushMplsAction().getEthernetType(), actionBuilder);
+        PushMplsCaseBuilder pushMplsCaseBuilder = new PushMplsCaseBuilder();
+        PushMplsActionBuilder pushMplsBuilder = new PushMplsActionBuilder();
+        pushMplsBuilder.setEthertype(new EtherType(pushMplsActionCase.getPushMplsAction().getEthernetType()));
+        pushMplsCaseBuilder.setPushMplsAction(pushMplsBuilder.build());
+        actionBuilder.setActionChoice(pushMplsCaseBuilder.build());
+        return actionBuilder.build();
     }
 
     private static Action salToOFPushPbbAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
             ActionBuilder actionBuilder) {
         PushPbbActionCase pushPbbActionCase = (PushPbbActionCase) action;
-        actionBuilder.setType(PushPbb.class);
-
-        return salToOFPushAction(pushPbbActionCase.getPushPbbAction().getEthernetType(), actionBuilder);
+        PushPbbCaseBuilder pushPbbCaseBuilder = new PushPbbCaseBuilder();
+        PushPbbActionBuilder pushPbbBuilder = new PushPbbActionBuilder();
+        pushPbbBuilder.setEthertype(new EtherType(pushPbbActionCase.getPushPbbAction().getEthernetType()));
+        pushPbbCaseBuilder.setPushPbbAction(pushPbbBuilder.build());
+        actionBuilder.setActionChoice(pushPbbCaseBuilder.build());
+        return actionBuilder.build();
     }
 
     private static Action salToOFPushVlanAction(
@@ -380,22 +390,29 @@ public final class ActionConvertor {
             // then we can ignore PUSH_VLAN as set-vlan-id will push a vlan header if not present
             return null;
         }
-
         PushVlanActionCase pushVlanActionCase = (PushVlanActionCase) action;
         PushVlanAction pushVlanAction = pushVlanActionCase.getPushVlanAction();
-        actionBuilder.setType(PushVlan.class);
 
-        return salToOFPushAction(pushVlanAction.getEthernetType(), actionBuilder);
+        PushVlanCaseBuilder pushVlanCaseBuilder = new PushVlanCaseBuilder();
+        PushVlanActionBuilder pushVlanBuilder = new PushVlanActionBuilder();
+        if (null != pushVlanAction.getEthernetType()) {
+            pushVlanBuilder.setEthertype(new EtherType(pushVlanAction.getEthernetType()));
+        }
+        pushVlanCaseBuilder.setPushVlanAction(pushVlanBuilder.build());
+        actionBuilder.setActionChoice(pushVlanCaseBuilder.build());
+        return actionBuilder.build();
     }
 
     private static Action salToOFSetNwTtl(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
             ActionBuilder actionBuilder) {
         SetNwTtlActionCase nwTtlActionCase = (SetNwTtlActionCase) action;
-        NwTtlActionBuilder nwTtlActionBuilder = new NwTtlActionBuilder();
-        nwTtlActionBuilder.setNwTtl(nwTtlActionCase.getSetNwTtlAction().getNwTtl());
-        actionBuilder.setType(SetNwTtl.class);
-        actionBuilder.addAugmentation(NwTtlAction.class, nwTtlActionBuilder.build());
+
+        SetNwTtlCaseBuilder nwTtlCaseBuilder = new SetNwTtlCaseBuilder();
+        SetNwTtlActionBuilder nwTtlBuilder = new SetNwTtlActionBuilder();
+        nwTtlBuilder.setNwTtl(nwTtlActionCase.getSetNwTtlAction().getNwTtl());
+        nwTtlCaseBuilder.setSetNwTtlAction(nwTtlBuilder.build());
+        actionBuilder.setActionChoice(nwTtlCaseBuilder.build());
         return actionBuilder.build();
     }
 
@@ -405,11 +422,11 @@ public final class ActionConvertor {
         SetQueueActionCase setQueueActionCase = (SetQueueActionCase) action;
         SetQueueAction setQueueAction = setQueueActionCase.getSetQueueAction();
 
-        QueueIdActionBuilder queueIdActionBuilder = new QueueIdActionBuilder();
-        queueIdActionBuilder.setQueueId(setQueueAction.getQueueId());
-        actionBuilder.setType(SetQueue.class);
-        actionBuilder.addAugmentation(QueueIdAction.class, queueIdActionBuilder.build());
-
+        SetQueueCaseBuilder setQueueCaseBuilder = new SetQueueCaseBuilder();
+        SetQueueActionBuilder setQueueBuilder = new SetQueueActionBuilder();
+        setQueueBuilder.setQueueId(setQueueAction.getQueueId());
+        setQueueCaseBuilder.setSetQueueAction(setQueueBuilder.build());
+        actionBuilder.setActionChoice(setQueueCaseBuilder.build());
         return actionBuilder.build();
     }
 
@@ -417,18 +434,22 @@ public final class ActionConvertor {
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
             ActionBuilder actionBuilder) {
         PopMplsActionCase popMplsActionCase = (PopMplsActionCase) action;
-        actionBuilder.setType(PopMpls.class);
 
-        return salToOFPushAction(popMplsActionCase.getPopMplsAction().getEthernetType(), actionBuilder);
+        PopMplsCaseBuilder popMplsCaseBuilder = new PopMplsCaseBuilder();
+        PopMplsActionBuilder popMplsBuilder = new PopMplsActionBuilder();
+        popMplsBuilder.setEthertype(new EtherType(new EtherType(popMplsActionCase.getPopMplsAction().getEthernetType())));
+        popMplsCaseBuilder.setPopMplsAction(popMplsBuilder.build());
+        actionBuilder.setActionChoice(popMplsCaseBuilder.build());
+        return actionBuilder.build();
     }
 
     private static Action salToOFPopVlan(ActionBuilder actionBuilder) {
-        actionBuilder.setType(PopVlan.class);
+        actionBuilder.setActionChoice(new PopVlanCaseBuilder().build());
         return emtpyAction(actionBuilder);
     }
 
     private static Action salToOFPopPBB(ActionBuilder actionBuilder) {
-        actionBuilder.setType(PopPbb.class);
+        actionBuilder.setActionChoice(new PopPbbCaseBuilder().build());
         return emtpyAction(actionBuilder);
     }
 
@@ -440,35 +461,39 @@ public final class ActionConvertor {
         SetVlanIdActionCase setvlanidcase = (SetVlanIdActionCase) action;
         SetVlanIdAction setvlanidaction = setvlanidcase.getSetVlanIdAction();
 
-        if (version == OFConstants.OFP_VERSION_1_0) {
+        SetVlanVidActionBuilder vlanidActionBuilder = new SetVlanVidActionBuilder();
+        SetVlanVidCaseBuilder setVlanVidCaseBuilder = new SetVlanVidCaseBuilder();
 
-            VlanVidActionBuilder vlanidActionBuilder = new VlanVidActionBuilder();
+        if (version == OFConstants.OFP_VERSION_1_0) {
             vlanidActionBuilder.setVlanVid(setvlanidaction.getVlanId().getValue());
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetVlanVid.class);
-            actionBuilder.addAugmentation(VlanVidAction.class, vlanidActionBuilder.build());
+            setVlanVidCaseBuilder.setSetVlanVidAction(vlanidActionBuilder.build());
+            actionBuilder.setActionChoice(setVlanVidCaseBuilder.build());
             return actionBuilder.build();
 
-        } else if (version >= OFConstants.OFP_VERSION_1_3) {
-            OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
-            List<MatchEntries> matchEntriesList = new ArrayList<>();
-            MatchEntriesBuilder matchEntriesBuilder = new MatchEntriesBuilder();
-            matchEntriesBuilder.setOxmClass(OpenflowBasicClass.class);
-            matchEntriesBuilder.setOxmMatchField(VlanVid.class);
-            VlanVidMatchEntryBuilder vlanVidBuilder = new VlanVidMatchEntryBuilder();
-            vlanVidBuilder.setCfiBit(true);
-            vlanVidBuilder.setVlanVid(setvlanidaction.getVlanId().getValue());
-            matchEntriesBuilder.addAugmentation(VlanVidMatchEntry.class, vlanVidBuilder.build());
-            matchEntriesBuilder.setHasMask(false);
-            matchEntriesList.add(matchEntriesBuilder.build());
-            oxmFieldsActionBuilder.setMatchEntries(matchEntriesList);
-            actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
-            return actionBuilder.build();
         } else {
-            LOG.error(UNKNOWN_ACTION_TYPE_VERSION, version);
-            return null;
+            if (version >= OFConstants.OFP_VERSION_1_3) {
+                SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
+                SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
+                List<MatchEntry> entries = new ArrayList<>();
+                MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
+                matchBuilder.setOxmClass(OpenflowBasicClass.class);
+                matchBuilder.setOxmMatchField(VlanVid.class);
+                matchBuilder.setHasMask(false);
+                VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder();
+                VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
+                vlanVidBuilder.setCfiBit(true);
+                vlanVidBuilder.setVlanVid(setvlanidaction.getVlanId().getValue());
+                vlanVidCaseBuilder.setVlanVid(vlanVidBuilder.build());
+                matchBuilder.setMatchEntryValue(vlanVidCaseBuilder.build());
+                entries.add(matchBuilder.build());
+                setFieldBuilder.setMatchEntry(entries);
+                setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
+                actionBuilder.setActionChoice(setFieldCaseBuilder.build());
+                return actionBuilder.build();
+            } else {
+                LOG.error(UNKNOWN_ACTION_TYPE_VERSION, version);
+                return null;
+            }
         }
     }
 
@@ -480,20 +505,22 @@ public final class ActionConvertor {
         SetVlanPcpAction setvlanpcpaction = setvlanpcpcase.getSetVlanPcpAction();
 
         if (version == OFConstants.OFP_VERSION_1_0) {
-            VlanPcpActionBuilder vlanpcpActionBuilder = new VlanPcpActionBuilder();
-            vlanpcpActionBuilder.setVlanPcp(setvlanpcpaction.getVlanPcp().getValue());
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetVlanPcp.class);
-            actionBuilder.addAugmentation(VlanPcpAction.class, vlanpcpActionBuilder.build());
+            SetVlanPcpActionBuilder setVlanPcpActionBuilder = new SetVlanPcpActionBuilder();
+            SetVlanPcpCaseBuilder setVlanPcpCaseBuilder = new SetVlanPcpCaseBuilder();
+            setVlanPcpActionBuilder.setVlanPcp(setvlanpcpaction.getVlanPcp().getValue());
+            setVlanPcpCaseBuilder.setSetVlanPcpAction(setVlanPcpActionBuilder.build());
+            actionBuilder.setActionChoice(setVlanPcpCaseBuilder.build());
             return actionBuilder.build();
         } else if (version >= OFConstants.OFP_VERSION_1_3) {
-            OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
-            List<MatchEntries> matchEntriesList = new ArrayList<>();
+            SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
+            SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
+
+            List<MatchEntry> matchEntriesList = new ArrayList<>();
             matchEntriesList.add(MatchConvertorImpl.toOfVlanPcp(setvlanpcpaction.getVlanPcp()));
-            oxmFieldsActionBuilder.setMatchEntries(matchEntriesList);
-            actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
+            setFieldBuilder.setMatchEntry(matchEntriesList);
+            setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
+            actionBuilder.setActionChoice(setFieldCaseBuilder.build());
+
             return actionBuilder.build();
         } else {
             LOG.error(UNKNOWN_ACTION_TYPE_VERSION, version);
@@ -503,26 +530,27 @@ public final class ActionConvertor {
 
     private static Action salToOFStripVlan(ActionBuilder actionBuilder, short version) {
         if (version == OFConstants.OFP_VERSION_1_0) {
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.StripVlan.class);
-
+            actionBuilder.setActionChoice(new StripVlanCaseBuilder().build());
             return emtpyAction(actionBuilder);
         } else if (version >= OFConstants.OFP_VERSION_1_3) {
-            OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
-            List<MatchEntries> matchEntriesList = new ArrayList<>();
-            MatchEntriesBuilder matchEntriesBuilder = new MatchEntriesBuilder();
-            matchEntriesBuilder.setOxmClass(OpenflowBasicClass.class);
-            matchEntriesBuilder.setOxmMatchField(VlanVid.class);
-            VlanVidMatchEntryBuilder vlanVidBuilder = new VlanVidMatchEntryBuilder();
+            SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
+            SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
+            List<MatchEntry> entries = new ArrayList<>();
+            MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
+            matchBuilder.setOxmClass(OpenflowBasicClass.class);
+            matchBuilder.setOxmMatchField(VlanVid.class);
+            matchBuilder.setHasMask(false);
+            VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder();
+            VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
             vlanVidBuilder.setCfiBit(true);
             vlanVidBuilder.setVlanVid(0x0000);
-            matchEntriesBuilder.addAugmentation(VlanVidMatchEntry.class, vlanVidBuilder.build());
-            matchEntriesBuilder.setHasMask(false);
-            matchEntriesList.add(matchEntriesBuilder.build());
-            oxmFieldsActionBuilder.setMatchEntries(matchEntriesList);
-            actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
+            vlanVidCaseBuilder.setVlanVid(vlanVidBuilder.build());
+            matchBuilder.setMatchEntryValue(vlanVidCaseBuilder.build());
+            matchBuilder.setHasMask(false);
+            entries.add(matchBuilder.build());
+            setFieldBuilder.setMatchEntry(entries);
+            setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
+            actionBuilder.setActionChoice(setFieldCaseBuilder.build());
             return actionBuilder.build();
         } else {
             LOG.error(UNKNOWN_ACTION_TYPE_VERSION, version);
@@ -538,20 +566,34 @@ public final class ActionConvertor {
         SetDlSrcAction setdlsrcaction = setdlsrccase.getSetDlSrcAction();
 
         if (version == OFConstants.OFP_VERSION_1_0) {
-            DlAddressActionBuilder dladdressactionbuilder = new DlAddressActionBuilder();
-            dladdressactionbuilder.setDlAddress(setdlsrcaction.getAddress());
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetDlSrc.class);
-            actionBuilder.addAugmentation(DlAddressAction.class, dladdressactionbuilder.build());
+            SetDlSrcCaseBuilder setDlSrcCaseBuilder = new SetDlSrcCaseBuilder();
+            SetDlSrcActionBuilder setDlSrcActionBuilder = new SetDlSrcActionBuilder();
+            setDlSrcActionBuilder.setDlSrcAddress(setdlsrcaction.getAddress());
+            setDlSrcCaseBuilder.setSetDlSrcAction(setDlSrcActionBuilder.build());
+            actionBuilder.setActionChoice(setDlSrcCaseBuilder.build());
             return actionBuilder.build();
         } else if (version >= OFConstants.OFP_VERSION_1_3) {
-            OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
-            List<MatchEntries> matchEntriesList = new ArrayList<>();
-            matchEntriesList.add(MatchConvertorImpl.toOfMacAddress(EthSrc.class, setdlsrcaction.getAddress(), null));
-            oxmFieldsActionBuilder.setMatchEntries(matchEntriesList);
-            actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
+            SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
+            SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
+
+            List<MatchEntry> entries = new ArrayList<>();
+            MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
+            matchBuilder.setOxmClass(OpenflowBasicClass.class);
+            matchBuilder.setOxmMatchField(EthSrc.class);
+            EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder();
+            EthSrcBuilder ethSrcBuilder = new EthSrcBuilder();
+            ethSrcBuilder.setMacAddress(setdlsrcaction.getAddress());
+            if (null != setdlsrcaction.getAddress()) {
+                ethSrcBuilder.setMask(ByteBufUtils.macAddressToBytes(setdlsrcaction.getAddress().getValue()));
+                matchBuilder.setHasMask(true);
+            }
+            ethSrcCaseBuilder.setEthSrc(ethSrcBuilder.build());
+            matchBuilder.setMatchEntryValue(ethSrcCaseBuilder.build());
+            entries.add(matchBuilder.build());
+            setFieldBuilder.setMatchEntry(entries);
+            setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
+            actionBuilder.setActionChoice(setFieldCaseBuilder.build());
+
             return actionBuilder.build();
         } else {
             LOG.error(UNKNOWN_ACTION_TYPE_VERSION, version);
@@ -567,20 +609,36 @@ public final class ActionConvertor {
         SetDlDstAction setdldstaction = setdldstcase.getSetDlDstAction();
 
         if (version == OFConstants.OFP_VERSION_1_0) {
-            DlAddressActionBuilder dladdressactionbuilder = new DlAddressActionBuilder();
-            dladdressactionbuilder.setDlAddress(setdldstaction.getAddress());
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetDlDst.class);
-            actionBuilder.addAugmentation(DlAddressAction.class, dladdressactionbuilder.build());
+            SetDlDstCaseBuilder setDlDstCaseBuilder = new SetDlDstCaseBuilder();
+            SetDlDstActionBuilder setDlDstActionBuilder = new SetDlDstActionBuilder();
+            setDlDstActionBuilder.setDlDstAddress(setdldstaction.getAddress());
+            setDlDstCaseBuilder.setSetDlDstAction(setDlDstActionBuilder.build());
+            actionBuilder.setActionChoice(setDlDstCaseBuilder.build());
             return actionBuilder.build();
         } else if (version >= OFConstants.OFP_VERSION_1_3) {
-            OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
-            List<MatchEntries> matchEntriesList = new ArrayList<>();
-            matchEntriesList.add(MatchConvertorImpl.toOfMacAddress(EthDst.class, setdldstaction.getAddress(), null));
-            oxmFieldsActionBuilder.setMatchEntries(matchEntriesList);
-            actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
+            SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
+            SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
+
+            List<MatchEntry> entries = new ArrayList<>();
+
+            MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
+            matchBuilder.setOxmClass(OpenflowBasicClass.class);
+            matchBuilder.setOxmMatchField(EthDst.class);
+            EthDstCaseBuilder ethDstCaseBuilder = new EthDstCaseBuilder();
+            EthDstBuilder ethDstBuilder = new EthDstBuilder();
+            ethDstBuilder.setMacAddress(setdldstaction.getAddress());
+            boolean hasMask = false;
+            if (null != setdldstaction.getAddress()) {
+                ethDstBuilder.setMask(ByteBufUtils.macAddressToBytes(setdldstaction.getAddress().getValue()));
+                hasMask = true;
+            }
+            matchBuilder.setHasMask(hasMask);
+            ethDstCaseBuilder.setEthDst(ethDstBuilder.build());
+            matchBuilder.setMatchEntryValue(ethDstCaseBuilder.build());
+            entries.add(matchBuilder.build());
+            setFieldBuilder.setMatchEntry(entries);
+            setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
+            actionBuilder.setActionChoice(setFieldCaseBuilder.build());
             return actionBuilder.build();
         } else {
             LOG.error(UNKNOWN_ACTION_TYPE_VERSION, version);
@@ -624,23 +682,23 @@ public final class ActionConvertor {
         SetNwTosAction setnwtosaction = setnwtoscase.getSetNwTosAction();
 
         if (version == OFConstants.OFP_VERSION_1_0) {
-            NwTosActionBuilder tosBuilder = new NwTosActionBuilder();
-            tosBuilder.setNwTos(setnwtosaction.getTos().shortValue());
-            actionBuilder.addAugmentation(NwTosAction.class, tosBuilder.build());
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetNwTos.class);
-
+            SetNwTosActionBuilder setNwTosActionBuilder = new SetNwTosActionBuilder();
+            SetNwTosCaseBuilder setNwTosCaseBuilder = new SetNwTosCaseBuilder();
+            setNwTosActionBuilder.setNwTos(setnwtosaction.getTos().shortValue());
+            setNwTosCaseBuilder.setSetNwTosAction(setNwTosActionBuilder.build());
+            actionBuilder.setActionChoice(setNwTosCaseBuilder.build());
             return actionBuilder.build();
         } else if (version >= OFConstants.OFP_VERSION_1_3) {
-            OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
-            List<MatchEntries> matchEntriesList = new ArrayList<>();
-            matchEntriesList.add(MatchConvertorImpl.toOfIpDscp(new Dscp(
+            SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
+            SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
+
+            List<MatchEntry> entries = new ArrayList<>();
+            entries.add(MatchConvertorImpl.toOfIpDscp(new Dscp(
                     ActionUtil.tosToDscp(setnwtosaction.getTos().shortValue())
-                    )));
-            oxmFieldsActionBuilder.setMatchEntries(matchEntriesList);
-            actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
+            )));
+            setFieldBuilder.setMatchEntry(entries);
+            setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
+            actionBuilder.setActionChoice(setFieldCaseBuilder.build());
             return actionBuilder.build();
         } else {
             LOG.error(UNKNOWN_ACTION_TYPE_VERSION, version);
@@ -653,65 +711,71 @@ public final class ActionConvertor {
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
             ActionBuilder actionBuilder, short version, IPProtocols protocol) {
 
+        SetTpSrcActionCase settpsrccase = (SetTpSrcActionCase) action;
+        SetTpSrcAction settpsrcaction = settpsrccase.getSetTpSrcAction();
         if (version == OFConstants.OFP_VERSION_1_0) {
-            SetTpSrcActionCase settpsrccase = (SetTpSrcActionCase) action;
-            SetTpSrcAction settpsrcaction = settpsrccase.getSetTpSrcAction();
-
-            PortActionBuilder settpsrc = new PortActionBuilder();
-            PortNumber port = new PortNumber(settpsrcaction.getPort().getValue().longValue());
-            settpsrc.setPort(port);
-
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetTpSrc.class);
-            actionBuilder.addAugmentation(PortAction.class, settpsrc.build());
+            SetTpSrcCaseBuilder setTpSrcCaseBuilder = new SetTpSrcCaseBuilder();
+            SetTpSrcActionBuilder setTpSrcActionBuilder = new SetTpSrcActionBuilder();
+            setTpSrcActionBuilder.setPort(new PortNumber(settpsrcaction.getPort()
+                    .getValue()
+                    .longValue()));
+            setTpSrcCaseBuilder.setSetTpSrcAction(setTpSrcActionBuilder.build());
+            actionBuilder.setActionChoice(setTpSrcCaseBuilder.build());
             return actionBuilder.build();
         } else if (version == OFConstants.OFP_VERSION_1_3) {
-            SetTpSrcActionCase settpsrccase = (SetTpSrcActionCase) action;
-            SetTpSrcAction settpsrcaction = settpsrccase.getSetTpSrcAction();
-            
-            MatchEntriesBuilder matchEntriesBuilder = new MatchEntriesBuilder();
-            matchEntriesBuilder.setOxmClass(OpenflowBasicClass.class);
-            matchEntriesBuilder.setHasMask(false);
-            PortMatchEntryBuilder portMatchEntryBuilder = new PortMatchEntryBuilder();
+            SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
+            SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
+
+            MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
+            matchBuilder.setOxmClass(OpenflowBasicClass.class);
+            matchBuilder.setHasMask(false);
+
+            InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder();
             int port = settpsrcaction.getPort().getValue().intValue();
             int type = 0x0f & port;
-            
-            switch(protocol) {
-            case ICMP: 
-                matchEntriesBuilder.setOxmMatchField(Icmpv4Type.class);
-                Icmpv4TypeMatchEntryBuilder icmpv4TypeMatchEntryBuilder = new Icmpv4TypeMatchEntryBuilder();
-                icmpv4TypeMatchEntryBuilder.setIcmpv4Type((short) type);
-                matchEntriesBuilder.addAugmentation(Icmpv4TypeMatchEntry.class, icmpv4TypeMatchEntryBuilder.build());
-                break;
-            case ICMPV6: 
-                matchEntriesBuilder.setOxmMatchField(Icmpv6Type.class);
-                Icmpv6TypeMatchEntryBuilder icmpv6TypeMatchEntryBuilder = new Icmpv6TypeMatchEntryBuilder();
-                icmpv6TypeMatchEntryBuilder.setIcmpv6Type((short) type);
-                matchEntriesBuilder.addAugmentation(Icmpv6TypeMatchEntry.class, icmpv6TypeMatchEntryBuilder.build());
-                break;
-            case TCP: 
-                matchEntriesBuilder.setOxmMatchField(TcpSrc.class);
-                portMatchEntryBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber(port));
-                matchEntriesBuilder.addAugmentation(PortMatchEntry.class, portMatchEntryBuilder.build());
-                break;
-            case UDP: 
-                matchEntriesBuilder.setOxmMatchField(UdpSrc.class);
-                portMatchEntryBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber(port));
-                matchEntriesBuilder.addAugmentation(PortMatchEntry.class, portMatchEntryBuilder.build());
-                break;
-            default: LOG.warn("Unknown protocol with combination of SetSourcePort: {}", protocol);
-                break;
+
+            switch (protocol) {
+                case ICMP:
+                    matchBuilder.setOxmMatchField(Icmpv4Type.class);
+                    Icmpv4TypeCaseBuilder icmpv4TypeCaseBuilder = new Icmpv4TypeCaseBuilder();
+                    Icmpv4TypeBuilder icmpv4TypeBuilder = new Icmpv4TypeBuilder();
+                    icmpv4TypeBuilder.setIcmpv4Type((short) type);
+                    icmpv4TypeCaseBuilder.setIcmpv4Type(icmpv4TypeBuilder.build());
+                    matchBuilder.setMatchEntryValue(icmpv4TypeCaseBuilder.build());
+                    break;
+                case ICMPV6:
+                    matchBuilder.setOxmMatchField(Icmpv6Type.class);
+                    Icmpv6TypeCaseBuilder icmpv6TypeCaseBuilder = new Icmpv6TypeCaseBuilder();
+                    Icmpv6TypeBuilder icmpv6TypeBuilder = new Icmpv6TypeBuilder();
+                    icmpv6TypeBuilder.setIcmpv6Type((short) type);
+                    icmpv6TypeCaseBuilder.setIcmpv6Type(icmpv6TypeBuilder.build());
+                    matchBuilder.setMatchEntryValue(icmpv6TypeCaseBuilder.build());
+                    break;
+                case TCP:
+                    matchBuilder.setOxmMatchField(TcpSrc.class);
+                    TcpSrcCaseBuilder tcpSrcCaseBuilder = new TcpSrcCaseBuilder();
+                    TcpSrcBuilder tcpSrcBuilder = new TcpSrcBuilder();
+                    tcpSrcBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber(port));
+                    tcpSrcCaseBuilder.setTcpSrc(tcpSrcBuilder.build());
+                    matchBuilder.setMatchEntryValue(tcpSrcCaseBuilder.build());
+                    break;
+                case UDP:
+                    matchBuilder.setOxmMatchField(UdpSrc.class);
+                    UdpSrcCaseBuilder udpSrcCaseBuilder = new UdpSrcCaseBuilder();
+                    UdpSrcBuilder udpSrcBuilder = new UdpSrcBuilder();
+                    udpSrcBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber(port));
+                    udpSrcCaseBuilder.setUdpSrc(udpSrcBuilder.build());
+                    matchBuilder.setMatchEntryValue(udpSrcCaseBuilder.build());
+                    break;
+                default:
+                    LOG.warn("Unknown protocol with combination of SetSourcePort: {}", protocol);
+                    break;
             }
-            
-            actionBuilder
-            .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
-            
-            OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
-            List<MatchEntries> matchEntries = new ArrayList<MatchEntries>();
-            matchEntries.add(matchEntriesBuilder.build());
-            oxmFieldsActionBuilder.setMatchEntries(matchEntries);
-
-            actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
+            List<MatchEntry> entries = new ArrayList<MatchEntry>();
+            entries.add(matchBuilder.build());
+            setFieldBuilder.setMatchEntry(entries);
+            setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
+            actionBuilder.setActionChoice(setFieldCaseBuilder.build());
             return actionBuilder.build();
         }
         LOG.error(UNKNOWN_ACTION_TYPE_VERSION, version);
@@ -722,64 +786,67 @@ public final class ActionConvertor {
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
             ActionBuilder actionBuilder, short version, IPProtocols protocol) {
 
+        SetTpDstActionCase settpdstcase = (SetTpDstActionCase) action;
+        SetTpDstAction settpdstaction = settpdstcase.getSetTpDstAction();
         if (version == OFConstants.OFP_VERSION_1_0) {
-            SetTpDstActionCase settpdstcase = (SetTpDstActionCase) action;
-            SetTpDstAction settpdstaction = settpdstcase.getSetTpDstAction();
-            PortActionBuilder settpdst = new PortActionBuilder();
-            PortNumber port = new PortNumber(settpdstaction.getPort().getValue().longValue());
-            settpdst.setPort(port);
-
-            actionBuilder
-                    .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetTpDst.class);
-            actionBuilder.addAugmentation(PortAction.class, settpdst.build());
+            SetTpDstCaseBuilder setTpDstCaseBuilder = new SetTpDstCaseBuilder();
+            SetTpDstActionBuilder setTpDstActionBuilder = new SetTpDstActionBuilder();
+            setTpDstActionBuilder.setPort(new PortNumber(settpdstaction.getPort().getValue().longValue()));
+            setTpDstCaseBuilder.setSetTpDstAction(setTpDstActionBuilder.build());
+            actionBuilder.setActionChoice(setTpDstCaseBuilder.build());
             return actionBuilder.build();
         } else if (version == OFConstants.OFP_VERSION_1_3) {
-            SetTpDstActionCase settpdstcase = (SetTpDstActionCase) action;
-            SetTpDstAction settpdstaction = settpdstcase.getSetTpDstAction();
-            
-            MatchEntriesBuilder matchEntriesBuilder = new MatchEntriesBuilder();
-            matchEntriesBuilder.setOxmClass(OpenflowBasicClass.class);
-            matchEntriesBuilder.setHasMask(false);
-            PortMatchEntryBuilder portMatchEntryBuilder = new PortMatchEntryBuilder();
+            SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();
+            SetFieldActionBuilder setFieldBuilder = new SetFieldActionBuilder();
+
+            MatchEntryBuilder matchBuilder = new MatchEntryBuilder();
+            matchBuilder.setOxmClass(OpenflowBasicClass.class);
+            matchBuilder.setHasMask(false);
             int port = settpdstaction.getPort().getValue().intValue();
             int code = 0x0f & port;
-            
-            switch(protocol) {
-            case ICMP: 
-                matchEntriesBuilder.setOxmMatchField(Icmpv4Code.class);
-                Icmpv4CodeMatchEntryBuilder icmpv4CodeMatchEntryBuilder = new Icmpv4CodeMatchEntryBuilder();
-                icmpv4CodeMatchEntryBuilder.setIcmpv4Code((short) code);
-                matchEntriesBuilder.addAugmentation(Icmpv4CodeMatchEntry.class, icmpv4CodeMatchEntryBuilder.build());
-                break;
-            case ICMPV6: 
-                matchEntriesBuilder.setOxmMatchField(Icmpv6Code.class);
-                Icmpv6CodeMatchEntryBuilder icmpv6CodeMatchEntryBuilder = new Icmpv6CodeMatchEntryBuilder();
-                icmpv6CodeMatchEntryBuilder.setIcmpv6Code((short) code);
-                matchEntriesBuilder.addAugmentation(Icmpv6CodeMatchEntry.class, icmpv6CodeMatchEntryBuilder.build());
-                break;
-            case TCP: 
-                matchEntriesBuilder.setOxmMatchField(TcpDst.class);
-                portMatchEntryBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber(port));
-                matchEntriesBuilder.addAugmentation(PortMatchEntry.class, portMatchEntryBuilder.build());
-                break;
-            case UDP: 
-                matchEntriesBuilder.setOxmMatchField(UdpDst.class);
-                portMatchEntryBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber(port));
-                matchEntriesBuilder.addAugmentation(PortMatchEntry.class, portMatchEntryBuilder.build());
-                break;
-            default: LOG.warn("Unknown protocol with combination of SetDestinationPort: {}", protocol);
-                break;
+
+            switch (protocol) {
+                case ICMP:
+                    matchBuilder.setOxmMatchField(Icmpv4Type.class);
+                    Icmpv4CodeCaseBuilder icmpv4CodeCaseBuilder = new Icmpv4CodeCaseBuilder();
+                    Icmpv4CodeBuilder icmpv4CodeBuilder = new Icmpv4CodeBuilder();
+                    icmpv4CodeBuilder.setIcmpv4Code((short) code);
+                    icmpv4CodeCaseBuilder.setIcmpv4Code(icmpv4CodeBuilder.build());
+                    matchBuilder.setMatchEntryValue(icmpv4CodeCaseBuilder.build());
+                    break;
+                case ICMPV6:
+                    matchBuilder.setOxmMatchField(Icmpv6Code.class);
+                    Icmpv6CodeCaseBuilder icmpv6CodeCaseBuilder = new Icmpv6CodeCaseBuilder();
+                    Icmpv6CodeBuilder icmpv6CodeBuilder = new Icmpv6CodeBuilder();
+                    icmpv6CodeBuilder.setIcmpv6Code((short) code);
+                    icmpv6CodeCaseBuilder.setIcmpv6Code(icmpv6CodeBuilder.build());
+                    matchBuilder.setMatchEntryValue(icmpv6CodeCaseBuilder.build());
+                    break;
+                case TCP:
+                    matchBuilder.setOxmMatchField(TcpDst.class);
+                    TcpDstCaseBuilder tcpDstCaseBuilder = new TcpDstCaseBuilder();
+                    TcpDstBuilder tcpDstBuilder = new TcpDstBuilder();
+                    tcpDstBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber(port));
+                    tcpDstCaseBuilder.setTcpDst(tcpDstBuilder.build());
+                    matchBuilder.setMatchEntryValue(tcpDstCaseBuilder.build());
+                    break;
+                case UDP:
+                    matchBuilder.setOxmMatchField(UdpDst.class);
+                    UdpSrcCaseBuilder udpSrcCaseBuilder = new UdpSrcCaseBuilder();
+                    UdpSrcBuilder udpSrcBuilder = new UdpSrcBuilder();
+                    udpSrcBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber(port));
+                    udpSrcCaseBuilder.setUdpSrc(udpSrcBuilder.build());
+                    matchBuilder.setMatchEntryValue(udpSrcCaseBuilder.build());
+                    break;
+                default:
+                    LOG.warn("Unknown protocol with combination of SetSourcePort: {}", protocol);
+                    break;
             }
-            
-            actionBuilder
-            .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField.class);
-            
-            OxmFieldsActionBuilder oxmFieldsActionBuilder = new OxmFieldsActionBuilder();
-            List<MatchEntries> matchEntries = new ArrayList<MatchEntries>();
-            matchEntries.add(matchEntriesBuilder.build());
-            oxmFieldsActionBuilder.setMatchEntries(matchEntries);
-
-            actionBuilder.addAugmentation(OxmFieldsAction.class, oxmFieldsActionBuilder.build());
+            List<MatchEntry> entries = new ArrayList<MatchEntry>();
+            entries.add(matchBuilder.build());
+            setFieldBuilder.setMatchEntry(entries);
+            setFieldCaseBuilder.setSetFieldAction(setFieldBuilder.build());
+            actionBuilder.setActionChoice(setFieldCaseBuilder.build());
             return actionBuilder.build();
         }
         LOG.error(UNKNOWN_ACTION_TYPE_VERSION, version);
@@ -789,31 +856,24 @@ public final class ActionConvertor {
     private static Action salToOFGroupAction(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action,
             ActionBuilder actionBuilder) {
-
         GroupActionCase groupActionCase = (GroupActionCase) action;
         GroupAction groupAction = groupActionCase.getGroupAction();
+        GroupCaseBuilder groupCaseBuilder = new GroupCaseBuilder();
+        GroupActionBuilder groupActionBuilder = new GroupActionBuilder();
 
-        GroupIdActionBuilder groupIdBuilder = new GroupIdActionBuilder();
-        groupIdBuilder.setGroupId(groupAction.getGroupId());
-        actionBuilder.setType(Group.class);
-        actionBuilder.addAugmentation(GroupIdAction.class, groupIdBuilder.build());
-        return actionBuilder.build();
-    }
-
-    private static Action salToOFPushAction(Integer ethernetType, ActionBuilder actionBuilder) {
-        EthertypeActionBuilder ethertypeActionBuilder = new EthertypeActionBuilder();
-        if (ethernetType != null) {
-            ethertypeActionBuilder.setEthertype(new EtherType(ethernetType));
+        if (null != groupAction.getGroupId()) {
+            groupActionBuilder.setGroupId(groupAction.getGroupId());
+        } else {
+            groupActionBuilder.setGroupId(Long.parseLong(groupAction.getGroup()));
         }
 
-        /* OF */
-        actionBuilder.addAugmentation(EthertypeAction.class, ethertypeActionBuilder.build());
+        groupCaseBuilder.setGroupAction(groupActionBuilder.build());
+        actionBuilder.setActionChoice(groupCaseBuilder.build());
         return actionBuilder.build();
     }
 
     private static Action salToOFDecMplsTtl(ActionBuilder actionBuilder) {
-        actionBuilder
-                .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecMplsTtl.class);
+        actionBuilder.setActionChoice(new DecMplsTtlCaseBuilder().build());
         return emtpyAction(actionBuilder);
     }
 
@@ -822,24 +882,21 @@ public final class ActionConvertor {
             ActionBuilder actionBuilder) {
         SetMplsTtlActionCase mplsTtlActionCase = (SetMplsTtlActionCase) action;
         SetMplsTtlAction mplsTtlAction = mplsTtlActionCase.getSetMplsTtlAction();
-
-        MplsTtlActionBuilder mplsTtlActionBuilder = new MplsTtlActionBuilder();
-        mplsTtlActionBuilder.setMplsTtl(mplsTtlAction.getMplsTtl()/* SAL */);
-        /* OF */
-        actionBuilder.setType(SetMplsTtl.class);
-        actionBuilder.addAugmentation(MplsTtlAction.class, mplsTtlActionBuilder.build());
+        SetMplsTtlCaseBuilder setMplsTtlCaseBuilder = new SetMplsTtlCaseBuilder();
+        SetMplsTtlActionBuilder setMplsTtlBuilder = new SetMplsTtlActionBuilder();
+        setMplsTtlBuilder.setMplsTtl(mplsTtlAction.getMplsTtl()/* SAL */);
+        setMplsTtlCaseBuilder.setSetMplsTtlAction(setMplsTtlBuilder.build());
+        actionBuilder.setActionChoice(setMplsTtlCaseBuilder.build());
         return actionBuilder.build();
     }
 
     private static Action salToOFCopyTTLIIn(ActionBuilder actionBuilder) {
-        actionBuilder
-                .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlIn.class);
+        actionBuilder.setActionChoice(new CopyTtlInCaseBuilder().build());
         return emtpyAction(actionBuilder);
     }
 
     private static Action salToOFCopyTTLIOut(ActionBuilder actionBuilder) {
-        actionBuilder
-                .setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlOut.class);
+        actionBuilder.setActionChoice(new CopyTtlOutCaseBuilder().build());
         return emtpyAction(actionBuilder);
 
     }
@@ -853,27 +910,24 @@ public final class ActionConvertor {
             ActionBuilder actionBuilder, short version) {
 
         OutputAction outputAction = outputActionCase.getOutputAction();
-        PortActionBuilder portAction = new PortActionBuilder();
-        MaxLengthActionBuilder maxLenActionBuilder = new MaxLengthActionBuilder();
+        OutputActionCaseBuilder caseBuilder = new OutputActionCaseBuilder();
+        OutputActionBuilder outputBuilder = new OutputActionBuilder();
+
         if (outputAction.getMaxLength() != null) {
-            maxLenActionBuilder.setMaxLength(outputAction.getMaxLength());
+            outputBuilder.setMaxLength(outputAction.getMaxLength());
         } else {
-            maxLenActionBuilder.setMaxLength(0);
+            outputBuilder.setMaxLength(0);
         }
-        actionBuilder.addAugmentation(MaxLengthAction.class, maxLenActionBuilder.build());
-
         Uri uri = outputAction.getOutputNodeConnector();
-
         OpenflowVersion ofVersion = OpenflowVersion.get(version);
         Long portNumber = InventoryDataServiceUtil.portNumberfromNodeConnectorId(ofVersion, uri.getValue());
         if (OpenflowPortsUtil.checkPortValidity(ofVersion, portNumber)) {
-            portAction.setPort(new PortNumber(portNumber));
+            outputBuilder.setPort(new PortNumber(portNumber));
         } else {
             LOG.error("Invalid Port specified " + portNumber + " for Output Action for OF version:" + ofVersion);
         }
-
-        actionBuilder.setType(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output.class);
-        actionBuilder.addAugmentation(PortAction.class, portAction.build());
+        caseBuilder.setOutputAction(outputBuilder.build());
+        actionBuilder.setActionChoice(caseBuilder.build());
         return actionBuilder.build();
 
     }
@@ -891,85 +945,61 @@ public final class ActionConvertor {
 
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action> bucketActions = new ArrayList<>();
         for (Action action : actionList) {
-            if (action.getType().equals(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output.class)) {
+            if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.OutputActionCase) {
                 bucketActions.add(ofToSALOutputAction(ofVersion, action));
-
-            } else if (action.getType().equals(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Group.class)) {
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.GroupCase) {
                 bucketActions.add(ofToSALGroupAction(action));
-
-            } else if (action.getType().equals(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlOut.class)) {
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlOutCase) {
                 CopyTtlOutBuilder copyTtlOutaction = new CopyTtlOutBuilder();
-                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)) {
+                bucketActions.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlOutCaseBuilder().setCopyTtlOut(copyTtlOutaction.build()).build());
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlInCase) {
                 CopyTtlInBuilder copyTtlInaction = new CopyTtlInBuilder();
-                bucketActions.add(new CopyTtlInCaseBuilder().setCopyTtlIn(copyTtlInaction.build()).build());
+                bucketActions.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlInCaseBuilder().setCopyTtlIn(copyTtlInaction.build()).build());
 
-            } else if (action.getType().equals(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetMplsTtl.class)) {
+            } else if (action.getActionChoice() instanceof SetMplsTtlCase) {
                 bucketActions.add(ofToSALSetMplsTtl(action));
-
-            } else if (action.getType().equals(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecMplsTtl.class)) {
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.DecMplsTtlCase) {
                 DecMplsTtlBuilder decMplsTtl = new DecMplsTtlBuilder();
-                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(new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecMplsTtlCaseBuilder().setDecMplsTtl(decMplsTtl.build()).build());
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushVlanCase) {
                 bucketActions.add(ofToSALPushVlanAction(action));
-
-            } else if (action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopVlan.class)
-                    || action.getType().equals(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.StripVlan.class)) {
+            } else if ((action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopVlanCase)
+                    || (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.StripVlanCase)) {
                 // OF1.0 nodes will emit StripVlan and OF1.3+ will emit StripVlan/PopVlan, convert both to PopVlan for SAL
                 PopVlanActionBuilder popVlan = new PopVlanActionBuilder();
                 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)) {
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushMplsCase) {
                 bucketActions.add(ofToSALPushMplsAction(action));
-
-            } else if (action.getType().equals(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopMpls.class)) {
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopMplsCase) {
                 bucketActions.add(ofToSALPopMplsAction(action));
-
-            } else if (action.getType().equals(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetQueue.class)) {
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetQueueCase) {
                 bucketActions.add(ofToSALSetQueue(action));
-
-            } else if (action.getType().equals(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetNwTtl.class)) {
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwTtlCase) {
                 bucketActions.add(ofToSALSetNwTtl(action));
-
-            } else if (action.getType().equals(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecNwTtl.class)) {
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.DecNwTtlCase) {
                 DecNwTtlBuilder decNwTtl = new DecNwTtlBuilder();
-                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(MatchConvertorImpl.fromOFSetFieldToSALSetFieldAction(action, ofVersion))
-                        .build());
-            } else if (action.getType().equals(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushPbb.class)) {
+                bucketActions.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecNwTtlCaseBuilder()
+                        .setDecNwTtl(decNwTtl.build()).build());
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase) {
+                bucketActions.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCaseBuilder()
+                        .setSetField(MatchConvertorImpl.fromOFSetFieldToSALSetFieldAction(action, ofVersion)).build());
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushPbbCase) {
                 bucketActions.add(ofToSALPushPbbAction(action));
-
-            } else if (action.getType().equals(
-                    org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopPbb.class)) {
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopPbbCase) {
                 PopPbbActionBuilder popPbb = new PopPbbActionBuilder();
                 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)) {
+            } else if (action.getActionChoice() instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwDstCase) {
+                org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.nw.dst.action._case.SetNwDstActionBuilder setNwDstActionBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.nw.dst.action._case.SetNwDstActionBuilder();
+                bucketActions.add(new SetNwDstActionCaseBuilder().setSetNwDstAction(setNwDstActionBuilder.build()).build());
+
+            } else if (action.getActionChoice() instanceof ExperimenterIdCase) {
                 /**
                  * TODO: EXTENSION PROPOSAL (action, OFJava to MD-SAL)
-                 * - we might also need a way on how to identify exact type of augmentation to be 
+                 * - we might also need a way on how to identify exact type of augmentation to be
                  *   used as match can be bound to multiple models
                  */
-                org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action processedAction = 
+                org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action processedAction =
                         ActionExtensionHelper.processAlienAction(action, ofVersion, actionPath);
                 if (processedAction != null) {
                     bucketActions.add(processedAction);
@@ -989,25 +1019,33 @@ public final class ActionConvertor {
      * @return OutputAction
      */
     public static OutputActionCase ofToSALOutputAction(OpenflowVersion ofVersion, Action action) {
-        OutputActionBuilder outputAction = new OutputActionBuilder();
-        PortAction port = action.getAugmentation(PortAction.class);
-        if (port != null) {
-            CommonPort.PortNumber protocolAgnosticPort = OpenflowPortsUtil.getProtocolAgnosticPort(
-                    ofVersion, port.getPort().getValue());
+        org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputActionBuilder outputAction =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputActionBuilder();
+
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.OutputActionCase actionCase =
+                (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.OutputActionCase) action.getActionChoice();
+
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.output.action._case.OutputAction outputActionFromOF = actionCase.getOutputAction();
+        if (outputActionFromOF.getPort() != null) {
+            PortNumberUni protocolAgnosticPort = OpenflowPortsUtil.getProtocolAgnosticPort(
+                    ofVersion, outputActionFromOF.getPort().getValue());
             String portNumberAsString = OpenflowPortsUtil.portNumberToString(protocolAgnosticPort);
             outputAction.setOutputNodeConnector(new Uri(portNumberAsString));
         } else {
             LOG.error("Provided action is not OF Output action, no associated port found!");
         }
 
-        MaxLengthAction length = action.getAugmentation(MaxLengthAction.class);
-        if (length != null) {
-            outputAction.setMaxLength(length.getMaxLength());
+        Integer maxLength = outputActionFromOF.getMaxLength();
+        if (maxLength != null) {
+            outputAction.setMaxLength(maxLength);
         } else {
             LOG.error("Provided action is not OF Output action, no associated length found!");
         }
 
-        return new OutputActionCaseBuilder().setOutputAction(outputAction.build()).build();
+        org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCaseBuilder outputActionCaseBuilder =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCaseBuilder();
+        outputActionCaseBuilder.setOutputAction(outputAction.build());
+        return outputActionCaseBuilder.build();
     }
 
     /**
@@ -1017,11 +1055,13 @@ public final class ActionConvertor {
      * @return GroupAction
      */
     public static GroupActionCase ofToSALGroupAction(Action action) {
+        GroupCase actionCase = (GroupCase) action.getActionChoice();
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.group._case.GroupAction groupActionFromOF =
+                actionCase.getGroupAction();
 
-        GroupActionBuilder groupAction = new GroupActionBuilder();
-
-        GroupIdAction groupId = action.getAugmentation(GroupIdAction.class);
-        groupAction.setGroupId(groupId.getGroupId());
+        org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.group.action._case.GroupActionBuilder groupAction =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.group.action._case.GroupActionBuilder();
+        groupAction.setGroupId(groupActionFromOF.getGroupId());
 
         return new GroupActionCaseBuilder().setGroupAction(groupAction.build()).build();
     }
@@ -1034,10 +1074,13 @@ public final class ActionConvertor {
      * @return
      */
     public static SetMplsTtlActionCase ofToSALSetMplsTtl(Action action) {
+        SetMplsTtlCase actionCase = (SetMplsTtlCase) action.getActionChoice();
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action
+                .choice.set.mpls.ttl._case.SetMplsTtlAction setMplsTtlActionFromOF = actionCase.getSetMplsTtlAction();
 
-        SetMplsTtlActionBuilder mplsTtlAction = new SetMplsTtlActionBuilder();
-        MplsTtlAction mplsTtl = action.getAugmentation(MplsTtlAction.class);
-        mplsTtlAction.setMplsTtl(mplsTtl.getMplsTtl());
+        org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.mpls.ttl.action._case.SetMplsTtlActionBuilder mplsTtlAction =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.mpls.ttl.action._case.SetMplsTtlActionBuilder();
+        mplsTtlAction.setMplsTtl(setMplsTtlActionFromOF.getMplsTtl());
         return new SetMplsTtlActionCaseBuilder().setSetMplsTtlAction(mplsTtlAction.build()).build();
     }
 
@@ -1048,12 +1091,15 @@ public final class ActionConvertor {
      * @return PushVlanAction
      */
     public static PushVlanActionCase ofToSALPushVlanAction(Action action) {
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushVlanCase actionCase =
+                (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushVlanCase) action.getActionChoice();
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.push.vlan._case.PushVlanAction pushVlanActionFromOF =
+                actionCase.getPushVlanAction();
 
-        PushVlanActionBuilder pushVlanAction = new PushVlanActionBuilder();
-
-        EthertypeAction etherType = action.getAugmentation(EthertypeAction.class);
-        pushVlanAction.setEthernetType(etherType.getEthertype().getValue());
+        org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.vlan.action._case.PushVlanActionBuilder pushVlanAction =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.vlan.action._case.PushVlanActionBuilder();
 
+        pushVlanAction.setEthernetType(pushVlanActionFromOF.getEthertype().getValue());
         return new PushVlanActionCaseBuilder().setPushVlanAction(pushVlanAction.build()).build();
     }
 
@@ -1064,12 +1110,12 @@ public final class ActionConvertor {
      * @return PushMplsAction
      */
     public static PushMplsActionCase ofToSALPushMplsAction(Action action) {
-
-        PushMplsActionBuilder pushMplsAction = new PushMplsActionBuilder();
-
-        EthertypeAction etherType = action.getAugmentation(EthertypeAction.class);
-        pushMplsAction.setEthernetType(etherType.getEthertype().getValue());
-
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushMplsCase actionCase =
+                (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushMplsCase) action.getActionChoice();
+        PushMplsAction pushMplsActionFromOF = actionCase.getPushMplsAction();
+        org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.mpls.action._case.PushMplsActionBuilder pushMplsAction =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.mpls.action._case.PushMplsActionBuilder();
+        pushMplsAction.setEthernetType(pushMplsActionFromOF.getEthertype().getValue());
         return new PushMplsActionCaseBuilder().setPushMplsAction(pushMplsAction.build()).build();
     }
 
@@ -1080,12 +1126,12 @@ public final class ActionConvertor {
      * @return PopMplsActionCase
      */
     public static PopMplsActionCase ofToSALPopMplsAction(Action action) {
-
-        PopMplsActionBuilder popMplsAction = new PopMplsActionBuilder();
-
-        EthertypeAction etherType = action.getAugmentation(EthertypeAction.class);
-        popMplsAction.setEthernetType(etherType.getEthertype().getValue());
-
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopMplsCase actionCase =
+                (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopMplsCase) action.getActionChoice();
+        PopMplsAction popMplsActionFromOF = actionCase.getPopMplsAction();
+        org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.mpls.action._case.PopMplsActionBuilder popMplsAction =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.mpls.action._case.PopMplsActionBuilder();
+        popMplsAction.setEthernetType(popMplsActionFromOF.getEthertype().getValue());
         return new PopMplsActionCaseBuilder().setPopMplsAction(popMplsAction.build()).build();
     }
 
@@ -1096,11 +1142,13 @@ public final class ActionConvertor {
      * @return SetQueueAction
      */
     public static SetQueueActionCase ofToSALSetQueue(Action action) {
-
-        SetQueueActionBuilder setQueueAction = new SetQueueActionBuilder();
-
-        QueueIdAction queueId = action.getAugmentation(QueueIdAction.class);
-        setQueueAction.setQueueId(queueId.getQueueId());
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetQueueCase actionCase =
+                (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetQueueCase) action.getActionChoice();
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.queue._case.SetQueueAction queueActionFromOF =
+                actionCase.getSetQueueAction();
+        org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.queue.action._case.SetQueueActionBuilder setQueueAction =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.queue.action._case.SetQueueActionBuilder();
+        setQueueAction.setQueueId(queueActionFromOF.getQueueId());
         return new SetQueueActionCaseBuilder().setSetQueueAction(setQueueAction.build()).build();
     }
 
@@ -1111,11 +1159,12 @@ public final class ActionConvertor {
      * @return SetNwTtlAction
      */
     public static SetNwTtlActionCase ofToSALSetNwTtl(Action action) {
-
-        SetNwTtlActionBuilder setNwTtl = new SetNwTtlActionBuilder();
-        NwTtlAction nwTtl = action.getAugmentation(NwTtlAction.class);
-        setNwTtl.setNwTtl(nwTtl.getNwTtl());
-
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwTtlCase actionCase =
+                (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwTtlCase) action.getActionChoice();
+        SetNwTtlAction setNwTtlActionFromOf = actionCase.getSetNwTtlAction();
+        org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.nw.ttl.action._case.SetNwTtlActionBuilder setNwTtl =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.nw.ttl.action._case.SetNwTtlActionBuilder();
+        setNwTtl.setNwTtl(setNwTtlActionFromOf.getNwTtl());
         return new SetNwTtlActionCaseBuilder().setSetNwTtlAction(setNwTtl.build()).build();
     }
 
@@ -1126,24 +1175,24 @@ public final class ActionConvertor {
      * @return PushVlanAction
      */
     public static PushPbbActionCase ofToSALPushPbbAction(Action action) {
-
-        PushPbbActionBuilder pushPbbAction = new PushPbbActionBuilder();
-
-        EthertypeAction etherType = action.getAugmentation(EthertypeAction.class);
-        pushPbbAction.setEthernetType(etherType.getEthertype().getValue());
-
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushPbbCase actionCase =
+                (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushPbbCase) action.getActionChoice();
+        PushPbbAction pushPbbActionFromOf = actionCase.getPushPbbAction();
+        org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.pbb.action._case.PushPbbActionBuilder pushPbbAction =
+                new org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.pbb.action._case.PushPbbActionBuilder();
+        pushPbbAction.setEthernetType(pushPbbActionFromOf.getEthertype().getValue());
         return new PushPbbActionCaseBuilder().setPushPbbAction(pushPbbAction.build()).build();
     }
 
-    //TODO make a model in YANG for protocols 
+    //TODO make a model in YANG for protocols
     /*private enum IPProtocols {
-        ICMP(1), 
-        TCP(6), 
-        UDP(17), 
+        ICMP(1),
+        TCP(6),
+        UDP(17),
         ICMPV6(58);
 
         private int protocol;
-        
+
         private static Map<Integer, IPProtocols> valueMap;
         static {
             valueMap = new HashMap<>();
@@ -1151,7 +1200,7 @@ public final class ActionConvertor {
                 valueMap.put(protocols.protocol, protocols);
             }
         }
-        
+
         private IPProtocols(int value) {
             this.protocol = value;
         }
@@ -1159,14 +1208,14 @@ public final class ActionConvertor {
         private byte getValue() {
             return (byte) this.protocol;
         }
-        
+
         private Short getShortValue() {
             return new Short((short) protocol);
         }
-        
+
         private IPProtocols fromProtocolNum(Short protocolNum) {
             return valueMap.get(protocolNum);
         }
     }    */
-    
+
 }