Reg move support for nicira experimenter fields
[openflowplugin.git] / extension / openflowplugin-extension-nicira / src / main / java / org / opendaylight / openflowplugin / extension / vendor / nicira / convertor / action / RegMoveConvertor.java
index a108e67e8c423214fae828cb9e2b7f34305dd908..0f5e51003674783c6517cbffd13a59e9789b4423 100644 (file)
@@ -8,8 +8,6 @@
 package org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.action;
 
 import com.google.common.base.Preconditions;
-import org.opendaylight.openflowjava.nx.codec.match.NiciraMatchCodecs;
-import org.opendaylight.openflowjava.nx.codec.match.NxmHeader;
 import org.opendaylight.openflowplugin.extension.api.ConvertorActionFromOFJava;
 import org.opendaylight.openflowplugin.extension.api.ConvertorActionToOFJava;
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
@@ -19,77 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev1
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.action.container.action.choice.ActionRegMoveBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.move.grouping.NxActionRegMove;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.reg.move.grouping.NxActionRegMoveBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg0;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg2;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg3;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg5;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg7;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.NxActionRegMoveGrouping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.DstChoice;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxArpShaCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxArpShaCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxArpThaCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxArpThaCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxEncapEthDstCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxEncapEthDstCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxEncapEthSrcCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxEncapEthSrcCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxIpv6DstCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxIpv6DstCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxIpv6SrcCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxIpv6SrcCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshMdtypeCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshMdtypeCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshNpCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshNpCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshc1Case;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshc1CaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshc2Case;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshc2CaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshc3Case;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshc3CaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshc4Case;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNshc4CaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNsiCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNsiCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNspCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxNspCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxOfInPortCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxOfInPortCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxRegCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxRegCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunGpeNpCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunGpeNpCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunIdCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunIdCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunIpv4DstCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunIpv4DstCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunIpv4SrcCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxTunIpv4SrcCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfArpOpCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfArpOpCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfArpSpaCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfArpSpaCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfArpTpaCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfArpTpaCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfEthDstCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfEthDstCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfEthSrcCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfEthSrcCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfIcmpTypeCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfIcmpTypeCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfIpDstCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfIpDstCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfIpSrcCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfIpSrcCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfMetadataCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfMetadataCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfMplsLabelCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfMplsLabelCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegMoveNotifFlowsStatisticsUpdateApplyActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.flows.statistics.update.flow.and.statistics.map.list.instructions.instruction.instruction.write.actions._case.write.actions.action.action.NxActionRegMoveNotifFlowsStatisticsUpdateWriteActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.get.flow.statistics.output.flow.and.statistics.map.list.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegMoveNotifDirectStatisticsUpdateApplyActionsCaseBuilder;
@@ -103,66 +31,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.DstBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.Src;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.SrcBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.SrcChoice;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxArpShaCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxArpShaCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxArpThaCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxArpThaCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxEncapEthDstCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxEncapEthDstCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxEncapEthSrcCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxEncapEthSrcCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxIpv6DstCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxIpv6DstCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxIpv6SrcCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxIpv6SrcCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshMdtypeCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshMdtypeCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshNpCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshNpCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshc1Case;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshc1CaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshc2Case;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshc2CaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshc3Case;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshc3CaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshc4Case;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNshc4CaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNsiCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNsiCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNspCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxNspCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxOfInPortCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxOfInPortCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxOfMetadataCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxOfMetadataCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxOfMplsLabelCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxRegCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxRegCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxTunGpeNpCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxTunGpeNpCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxTunIdCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxTunIdCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxTunIpv4DstCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxTunIpv4DstCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxTunIpv4SrcCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxTunIpv4SrcCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfArpOpCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfArpOpCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfArpSpaCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfArpSpaCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfArpTpaCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfArpTpaCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfEthDstCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfEthDstCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfEthSrcCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfEthSrcCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfEthTypeCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfEthTypeCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfIpDstCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfIpDstCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfIpSrcCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfIpSrcCaseBuilder;
 
 /**
  * Convert to/from SAL flow model to openflowjava model for NxActionRegMove action.
@@ -174,6 +42,8 @@ public class RegMoveConvertor implements
         ConvertorActionToOFJava<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action,
             Action>, ConvertorActionFromOFJava<Action, ActionPath> {
 
+
+
     @Override
     public Action convert(
             org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action nxActionArg) {
@@ -185,9 +55,9 @@ public class RegMoveConvertor implements
         final ActionRegMoveBuilder actionRegMoveBuilder = new ActionRegMoveBuilder();
         NxActionRegMoveBuilder nxActionRegMove = new NxActionRegMoveBuilder();
 
-        nxActionRegMove.setDst(resolveDst(dst.getDstChoice()));
+        nxActionRegMove.setDst(FieldChoiceResolver.resolveDstHeaderUint64(dst.getDstChoice()));
         nxActionRegMove.setDstOfs(dst.getStart());
-        nxActionRegMove.setSrc(resolveSrc(src.getSrcChoice()));
+        nxActionRegMove.setSrc(FieldChoiceResolver.resolveSrcHeaderUint64(src.getSrcChoice()));
         nxActionRegMove.setSrcOfs(src.getStart());
         nxActionRegMove.setNBits(dst.getEnd() - dst.getStart() + 1);
         actionRegMoveBuilder.setNxActionRegMove(nxActionRegMove.build());
@@ -199,11 +69,11 @@ public class RegMoveConvertor implements
             Action input, ActionPath path) {
         NxActionRegMove actionRegMove = ((ActionRegMove) input.getActionChoice()).getNxActionRegMove();
         DstBuilder dstBuilder = new DstBuilder();
-        dstBuilder.setDstChoice(resolveDstValue(actionRegMove.getDst()));
+        dstBuilder.setDstChoice(FieldChoiceResolver.resolveDstChoice(actionRegMove.getDst()));
         dstBuilder.setStart(actionRegMove.getDstOfs());
         dstBuilder.setEnd(actionRegMove.getDstOfs() + actionRegMove.getNBits() - 1);
         SrcBuilder srcBuilder = new SrcBuilder();
-        srcBuilder.setSrcChoice(resolveSrcValue(actionRegMove.getSrc()));
+        srcBuilder.setSrcChoice(FieldChoiceResolver.resolveSrcChoice(actionRegMove.getSrc()));
         srcBuilder.setStart(actionRegMove.getSrcOfs());
         srcBuilder.setEnd(actionRegMove.getSrcOfs() + actionRegMove.getNBits() - 1);
         NxRegMoveBuilder nxRegMoveBuilder = new NxRegMoveBuilder();
@@ -212,223 +82,6 @@ public class RegMoveConvertor implements
         return resolveAction(nxRegMoveBuilder.build(), path);
     }
 
-    public static DstChoice resolveDstValue(long dstValue) {
-        Class<? extends NxmNxReg> potentialDst = resolveCodec(dstValue);
-        if (potentialDst != null) {
-            return new DstNxRegCaseBuilder().setNxReg(potentialDst).build();
-        }
-        if (dstValue == NiciraMatchCodecs.TUN_ID_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxTunIdCaseBuilder().setNxTunId(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxArpShaCaseBuilder().setNxArpSha(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.ARP_THA_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxArpThaCaseBuilder().setNxArpTha(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.ARP_OP_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstOfArpOpCaseBuilder().setOfArpOp(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.ARP_SPA_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstOfArpSpaCaseBuilder().setOfArpSpa(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.ARP_TPA_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstOfArpTpaCaseBuilder().setOfArpTpa(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxOfInPortCaseBuilder().setOfInPort(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.OXM_OF_METADATA_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstOfMetadataCaseBuilder().setOfMetadata(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask().toLong()) {
-            return new DstOfMplsLabelCaseBuilder().setOfMplsLabel(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.ETH_DST_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstOfEthDstCaseBuilder().setOfEthDst(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.ETH_SRC_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstOfEthSrcCaseBuilder().setOfEthSrc(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.NSP_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxNspCaseBuilder().setNxNspDst(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.NSI_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxNsiCaseBuilder().setNxNsiDst(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.NSC1_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxNshc1CaseBuilder().setNxNshc1Dst(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.NSC2_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxNshc2CaseBuilder().setNxNshc2Dst(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.NSC3_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxNshc3CaseBuilder().setNxNshc3Dst(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.NSC4_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxNshc4CaseBuilder().setNxNshc4Dst(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.ENCAP_ETH_SRC_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxEncapEthSrcCaseBuilder().setNxEncapEthSrc(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.ENCAP_ETH_DST_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxEncapEthDstCaseBuilder().setNxEncapEthDst(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.NSH_MDTYPE_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxNshMdtypeCaseBuilder().setNxNshMdtype(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.NSH_NP_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxNshNpCaseBuilder().setNxNshNp(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.TUN_GPE_NP_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxTunGpeNpCaseBuilder().setNxTunGpeNp(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.IP_SRC_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstOfIpSrcCaseBuilder().setOfIpSrc(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.IP_DST_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstOfIpDstCaseBuilder().setOfIpDst(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.IPV6_SRC_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxIpv6SrcCaseBuilder().setNxIpv6Src(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstNxIpv6DstCaseBuilder().setNxIpv6Dst(true).build();
-        }
-        if (dstValue == NiciraMatchCodecs.ICMP_TYPE_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new DstOfIcmpTypeCaseBuilder().setOfIcmpType(true).build();
-        }
-
-        throw new CodecPreconditionException("Missing codec for " + new NxmHeader(dstValue));
-    }
-
-    static SrcChoice resolveSrcValue(long srcValue) {
-        Class<? extends NxmNxReg> potentialSrc = resolveCodec(srcValue);
-        if (potentialSrc != null) {
-            return new SrcNxRegCaseBuilder().setNxReg(potentialSrc).build();
-        }
-        if (srcValue == NiciraMatchCodecs.TUN_ID_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxTunIdCaseBuilder().setNxTunId(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxArpShaCaseBuilder().setNxArpSha(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.ARP_THA_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxArpThaCaseBuilder().setNxArpTha(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.ARP_OP_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcOfArpOpCaseBuilder().setOfArpOp(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.ARP_SPA_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcOfArpSpaCaseBuilder().setOfArpSpa(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.ARP_TPA_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcOfArpTpaCaseBuilder().setOfArpTpa(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxOfInPortCaseBuilder().setOfInPort(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.OXM_OF_METADATA_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxOfMetadataCaseBuilder().setOfMetadata(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.ETH_DST_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcOfEthDstCaseBuilder().setOfEthDst(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.ETH_SRC_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcOfEthSrcCaseBuilder().setOfEthSrc(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.ETH_TYPE_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcOfEthTypeCaseBuilder().setOfEthType(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.NSP_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxNspCaseBuilder().setNxNspDst(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.NSI_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxNsiCaseBuilder().setNxNsiDst(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.NSC1_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxNshc1CaseBuilder().setNxNshc1Dst(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.NSC2_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxNshc2CaseBuilder().setNxNshc2Dst(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.NSC3_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxNshc3CaseBuilder().setNxNshc3Dst(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.NSC4_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxNshc4CaseBuilder().setNxNshc4Dst(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.ENCAP_ETH_SRC_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxEncapEthSrcCaseBuilder().setNxEncapEthSrc(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.ENCAP_ETH_DST_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxEncapEthDstCaseBuilder().setNxEncapEthDst(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.NSH_MDTYPE_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxNshMdtypeCaseBuilder().setNxNshMdtype(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.NSH_NP_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxNshNpCaseBuilder().setNxNshNp(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.TUN_GPE_NP_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxTunGpeNpCaseBuilder().setNxTunGpeNp(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.IP_DST_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcOfIpDstCaseBuilder().setOfIpDst(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.IP_SRC_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcOfIpSrcCaseBuilder().setOfIpSrc(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.IPV6_SRC_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxIpv6SrcCaseBuilder().setNxIpv6Src(true).build();
-        }
-        if (srcValue == NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return new SrcNxIpv6DstCaseBuilder().setNxIpv6Dst(true).build();
-        }
-
-        throw new CodecPreconditionException("Missing codec for " + new NxmHeader(srcValue));
-    }
-
-    private static Class<? extends NxmNxReg> resolveCodec(long value) {
-        if (value == NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return NxmNxReg0.class;
-        }
-        if (value == NiciraMatchCodecs.REG1_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return NxmNxReg1.class;
-        }
-        if (value == NiciraMatchCodecs.REG2_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return NxmNxReg2.class;
-        }
-        if (value == NiciraMatchCodecs.REG3_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return NxmNxReg3.class;
-        }
-        if (value == NiciraMatchCodecs.REG4_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return NxmNxReg4.class;
-        }
-        if (value == NiciraMatchCodecs.REG5_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return NxmNxReg5.class;
-        }
-        if (value == NiciraMatchCodecs.REG6_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return NxmNxReg6.class;
-        }
-        if (value == NiciraMatchCodecs.REG7_CODEC.getHeaderWithoutHasMask().toLong()) {
-            return NxmNxReg7.class;
-        }
-        return null;
-    }
-
     private static org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action resolveAction(
             NxRegMove value, ActionPath path) {
         switch (path) {
@@ -455,237 +108,4 @@ public class RegMoveConvertor implements
         }
     }
 
-    public static long resolveDst(DstChoice dstChoice) {
-        if (dstChoice instanceof DstNxRegCase) {
-            return resolveReg(((DstNxRegCase) dstChoice).getNxReg());
-        }
-        if (dstChoice instanceof DstNxTunIdCase) {
-            return NiciraMatchCodecs.TUN_ID_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxArpShaCase) {
-            return NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxArpThaCase) {
-            return NiciraMatchCodecs.ARP_THA_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstOfArpOpCase) {
-            return NiciraMatchCodecs.ARP_OP_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstOfArpSpaCase) {
-            return NiciraMatchCodecs.ARP_SPA_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstOfArpTpaCase) {
-            return NiciraMatchCodecs.ARP_TPA_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxOfInPortCase) {
-            return NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstOfMetadataCase) {
-            return NiciraMatchCodecs.OXM_OF_METADATA_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstOfMplsLabelCase) {
-            return NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxTunIpv4DstCase) {
-            return NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxTunIpv4SrcCase) {
-            return NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstOfEthDstCase) {
-            return NiciraMatchCodecs.ETH_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstOfEthSrcCase) {
-            return NiciraMatchCodecs.ETH_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxTunIpv4DstCase) {
-            return NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxTunIpv4SrcCase) {
-            return NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxNspCase) {
-            return NiciraMatchCodecs.NSP_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxNsiCase) {
-            return NiciraMatchCodecs.NSI_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxNshc1Case) {
-            return  NiciraMatchCodecs.NSC1_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxNshc2Case) {
-            return  NiciraMatchCodecs.NSC2_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxNshc3Case) {
-            return  NiciraMatchCodecs.NSC3_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxNshc4Case) {
-            return  NiciraMatchCodecs.NSC4_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstOfIpSrcCase) {
-            return NiciraMatchCodecs.IP_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstOfIpDstCase) {
-            return NiciraMatchCodecs.IP_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxIpv6SrcCase) {
-            return NiciraMatchCodecs.IPV6_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxIpv6DstCase) {
-            return NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstOfIcmpTypeCase) {
-            return NiciraMatchCodecs.ICMP_TYPE_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxEncapEthSrcCase) {
-            return  NiciraMatchCodecs.ENCAP_ETH_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxEncapEthDstCase) {
-            return  NiciraMatchCodecs.ENCAP_ETH_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxNshMdtypeCase) {
-            return  NiciraMatchCodecs.NSH_MDTYPE_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxNshNpCase) {
-            return  NiciraMatchCodecs.NSH_NP_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (dstChoice instanceof DstNxTunGpeNpCase) {
-            return  NiciraMatchCodecs.TUN_GPE_NP_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-
-
-        throw new CodecPreconditionException("Missing implementation of a case in dst-choice? " + dstChoice.getClass());
-    }
-
-    static long resolveSrc(SrcChoice srcChoice) {
-        if (srcChoice instanceof SrcNxRegCase) {
-            return resolveReg(((SrcNxRegCase) srcChoice).getNxReg());
-        }
-        if (srcChoice instanceof SrcNxTunIdCase) {
-            return NiciraMatchCodecs.TUN_ID_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxArpShaCase) {
-            return NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxArpThaCase) {
-            return NiciraMatchCodecs.ARP_THA_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcOfArpOpCase) {
-            return NiciraMatchCodecs.ARP_OP_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcOfArpSpaCase) {
-            return NiciraMatchCodecs.ARP_SPA_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcOfArpTpaCase) {
-            return NiciraMatchCodecs.ARP_TPA_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxOfInPortCase) {
-            return NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxOfMetadataCase) {
-            return NiciraMatchCodecs.OXM_OF_METADATA_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxOfMplsLabelCase) {
-            return NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxOfMetadataCase) {
-            return NiciraMatchCodecs.OXM_OF_METADATA_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxTunIpv4DstCase) {
-            return NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxTunIpv4SrcCase) {
-            return NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcOfEthDstCase) {
-            return NiciraMatchCodecs.ETH_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcOfEthSrcCase) {
-            return NiciraMatchCodecs.ETH_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcOfEthTypeCase) {
-            return NiciraMatchCodecs.ETH_TYPE_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxTunIpv4DstCase) {
-            return NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxTunIpv4SrcCase) {
-            return NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxNspCase) {
-            return NiciraMatchCodecs.NSP_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxNsiCase) {
-            return NiciraMatchCodecs.NSI_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxNshc1Case) {
-            return  NiciraMatchCodecs.NSC1_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxNshc2Case) {
-            return  NiciraMatchCodecs.NSC2_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxNshc3Case) {
-            return  NiciraMatchCodecs.NSC3_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxNshc4Case) {
-            return  NiciraMatchCodecs.NSC4_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcOfIpSrcCase) {
-            return NiciraMatchCodecs.IP_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcOfIpDstCase) {
-            return NiciraMatchCodecs.IP_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxIpv6SrcCase) {
-            return NiciraMatchCodecs.IPV6_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxIpv6DstCase) {
-            return NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxEncapEthSrcCase) {
-            return  NiciraMatchCodecs.ENCAP_ETH_SRC_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxEncapEthDstCase) {
-            return  NiciraMatchCodecs.ENCAP_ETH_DST_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxNshMdtypeCase) {
-            return  NiciraMatchCodecs.NSH_MDTYPE_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxNshNpCase) {
-            return  NiciraMatchCodecs.NSH_NP_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (srcChoice instanceof SrcNxTunGpeNpCase) {
-            return  NiciraMatchCodecs.TUN_GPE_NP_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-
-        throw new CodecPreconditionException("Missing implementation of a case in src-choice? " + srcChoice.getClass());
-    }
-
-    private static long resolveReg(Class<? extends NxmNxReg> reg) {
-        if (reg.equals(NxmNxReg0.class)) {
-            return NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (reg.equals(NxmNxReg1.class)) {
-            return NiciraMatchCodecs.REG1_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (reg.equals(NxmNxReg2.class)) {
-            return NiciraMatchCodecs.REG2_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (reg.equals(NxmNxReg3.class)) {
-            return NiciraMatchCodecs.REG3_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (reg.equals(NxmNxReg4.class)) {
-            return NiciraMatchCodecs.REG4_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (reg.equals(NxmNxReg5.class)) {
-            return NiciraMatchCodecs.REG5_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (reg.equals(NxmNxReg6.class)) {
-            return NiciraMatchCodecs.REG6_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        if (reg.equals(NxmNxReg7.class)) {
-            return NiciraMatchCodecs.REG7_CODEC.getHeaderWithoutHasMask().toLong();
-        }
-        throw new CodecPreconditionException("Missing codec for nxm_nx_reg?" + reg);
-    }
 }