Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
BUG-2794: incorporate ofjava instruction changes
[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / TableFeaturesReplyConvertorTest.java
diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesReplyConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesReplyConvertorTest.java
index 64d0daf3c94df62ba3f1ed172903719910167f4d..099fcc961d5f19ea73f52067b29bb3d7ce3aa94b 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesReplyConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/TableFeaturesReplyConvertorTest.java
@@ -14,55 +14,76 @@ import java.util.List;
 \r
 import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ActionRelatedTableFeatureProperty;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ActionRelatedTableFeaturePropertyBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.InstructionRelatedTableFeatureProperty;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.InstructionRelatedTableFeaturePropertyBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.NextTableRelatedTableFeatureProperty;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.NextTableRelatedTableFeaturePropertyBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.OxmRelatedTableFeatureProperty;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.OxmRelatedTableFeaturePropertyBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.table.features.properties.container.table.feature.properties.NextTableIds;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.table.features.properties.container.table.feature.properties.NextTableIdsBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlIn;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlOut;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecMplsTtl;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Group;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopPbb;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopVlan;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushPbb;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushVlan;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetField;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetMplsTtl;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetNwTtl;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.ApplyActions;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.ClearActions;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.GotoTable;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.Meter;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.WriteActions;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.WriteMetadata;\r
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeatureProperty;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.ActionRelatedTableFeaturePropertyBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeatureProperty;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.InstructionRelatedTableFeaturePropertyBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeatureProperty;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.NextTableRelatedTableFeaturePropertyBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeatureProperty;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.OxmRelatedTableFeaturePropertyBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIds;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev150225.table.features.properties.container.table.feature.properties.NextTableIdsBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlInCase;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlInCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlOutCase;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.CopyTtlOutCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.DecMplsTtlCase;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.DecMplsTtlCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.GroupCase;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.GroupCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopVlanCase;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopVlanCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushPbbCase;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushPbbCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushVlanCase;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PushVlanCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCase;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetFieldCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetMplsTtlCase;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetMplsTtlCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwSrcCase;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwSrcCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.group._case.GroupActionBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.push.pbb._case.PushPbbActionBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.push.vlan._case.PushVlanActionBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.field._case.SetFieldActionBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.mpls.ttl._case.SetMplsTtlActionBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.set.nw.src._case.SetNwSrcActionBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.Action;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.instruction.choice.ApplyActionsCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.instruction.choice.ClearActionsCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.instruction.choice.GotoTableCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.instruction.choice.MeterCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.instruction.choice.WriteActionsCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.instruction.choice.WriteMetadataCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.instruction.choice._goto.table._case.GotoTableBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.instruction.choice.apply.actions._case.ApplyActionsBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.instruction.choice.meter._case.MeterBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.instruction.choice.write.actions._case.WriteActionsBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instruction.grouping.instruction.choice.write.metadata._case.WriteMetadataBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.InstructionBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.EtherType;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableConfig;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.EthDst;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.EthSrc;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.InPhyPort;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.InPort;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.IpEcn;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.IpProto;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv6Exthdr;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OpenflowBasicClass;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.TcpSrc;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.UdpDst;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.UdpSrc;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.VlanPcp;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.VlanVid;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntriesBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthDst;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthSrc;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPhyPort;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPort;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpEcn;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpProto;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Exthdr;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OpenflowBasicClass;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpSrc;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.UdpDst;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.UdpSrc;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanPcp;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.table.features._case.MultipartReplyTableFeaturesBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.table.features._case.multipart.reply.table.features.TableFeaturesBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties;\r
@@ -82,7 +103,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table
 \r
 /**\r
  * @author michal.polkorab\r
- *\r
  */\r
 public class TableFeaturesReplyConvertorTest {\r
 \r
@@ -112,8 +132,8 @@ public class TableFeaturesReplyConvertorTest {
     public void testWithMPTableFeature() {\r
         MultipartReplyTableFeaturesBuilder builder = new MultipartReplyTableFeaturesBuilder();\r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart\r
-        .reply.multipart.reply.body.multipart.reply.table.features._case.multipart.reply.table.features\r
-        .TableFeatures> features = new ArrayList<>();\r
+                .reply.multipart.reply.body.multipart.reply.table.features._case.multipart.reply.table.features\r
+                .TableFeatures> features = new ArrayList<>();\r
         TableFeaturesBuilder featuresBuilder = new TableFeaturesBuilder();\r
         featuresBuilder.setTableId((short) 5);\r
         featuresBuilder.setName("Aloha");\r
@@ -144,8 +164,9 @@ public class TableFeaturesReplyConvertorTest {
     public void testWithMPTableFeatureWithProperties() {\r
         MultipartReplyTableFeaturesBuilder builder = new MultipartReplyTableFeaturesBuilder();\r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart\r
-        .reply.multipart.reply.body.multipart.reply.table.features._case.multipart.reply.table.features\r
-        .TableFeatures> features = new ArrayList<>();\r
+                .reply.multipart.reply.body.multipart.reply.table.features._case.multipart.reply.table.features\r
+                .TableFeatures> features = new ArrayList<>();\r
+\r
         TableFeaturesBuilder featuresBuilder = new TableFeaturesBuilder();\r
         featuresBuilder.setTableId((short) 5);\r
         featuresBuilder.setName("Aloha");\r
@@ -155,8 +176,10 @@ public class TableFeaturesReplyConvertorTest {
         featuresBuilder.setMetadataWrite(metaWrite);\r
         featuresBuilder.setConfig(new TableConfig(false));\r
         featuresBuilder.setMaxEntries(42L);\r
+\r
         List<TableFeatureProperties> properties = new ArrayList<>();\r
         TableFeaturePropertiesBuilder propBuilder = new TableFeaturePropertiesBuilder();\r
+\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTNEXTTABLES);\r
         NextTableRelatedTableFeaturePropertyBuilder nextPropBuilder =\r
                 new NextTableRelatedTableFeaturePropertyBuilder();\r
@@ -167,6 +190,7 @@ public class TableFeaturesReplyConvertorTest {
         propBuilder.addAugmentation(NextTableRelatedTableFeatureProperty.class, nextPropBuilder.build());\r
         properties.add(propBuilder.build());\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
+\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTNEXTTABLESMISS);\r
         nextPropBuilder = new NextTableRelatedTableFeaturePropertyBuilder();\r
         nextIds = new ArrayList<>();\r
@@ -175,38 +199,79 @@ public class TableFeaturesReplyConvertorTest {
         propBuilder.addAugmentation(NextTableRelatedTableFeatureProperty.class, nextPropBuilder.build());\r
         properties.add(propBuilder.build());\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
+\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTINSTRUCTIONS);\r
         InstructionRelatedTableFeaturePropertyBuilder insPropBuilder =\r
                 new InstructionRelatedTableFeaturePropertyBuilder();\r
+\r
+         /* -------------------------------------------------- */\r
+\r
+        List<Action> actions = new ArrayList<>();\r
         List<Instruction> insIds = new ArrayList<>();\r
         InstructionBuilder insBuilder = new InstructionBuilder();\r
-        insBuilder.setType(WriteActions.class);\r
+        WriteActionsCaseBuilder writeActionsCaseBuilder = new WriteActionsCaseBuilder();\r
+        WriteActionsBuilder writeActionsBuilder = new WriteActionsBuilder();\r
+        ActionBuilder actionBuilder = new ActionBuilder();\r
+        actionBuilder.setActionChoice(createSetNwSrcAction());\r
+        actions.add(actionBuilder.build());\r
+        writeActionsBuilder.setAction(actions);\r
+        writeActionsCaseBuilder.setWriteActions(writeActionsBuilder.build());\r
+        insBuilder.setInstructionChoice(writeActionsCaseBuilder.build());\r
         insIds.add(insBuilder.build());\r
+        \r
+         /* -------------------------------------------------- */\r
+\r
         insBuilder = new InstructionBuilder();\r
-        insBuilder.setType(GotoTable.class);\r
+        GotoTableCaseBuilder gotoCaseBuilder = new GotoTableCaseBuilder();\r
+        GotoTableBuilder gotoTableBuilder = new GotoTableBuilder();\r
+        gotoCaseBuilder.setGotoTable(gotoTableBuilder.build());\r
+        insBuilder.setInstructionChoice(gotoCaseBuilder.build());\r
         insIds.add(insBuilder.build());\r
         insPropBuilder.setInstruction(insIds);\r
         propBuilder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insPropBuilder.build());\r
         properties.add(propBuilder.build());\r
+\r
+         /* -------------------------------------------------- */\r
+\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTINSTRUCTIONSMISS);\r
         insPropBuilder = new InstructionRelatedTableFeaturePropertyBuilder();\r
         insIds = new ArrayList<>();\r
         insBuilder = new InstructionBuilder();\r
-        insBuilder.setType(WriteMetadata.class);\r
+        WriteMetadataCaseBuilder writeMetadataCaseBuilder = new WriteMetadataCaseBuilder();\r
+        WriteMetadataBuilder writeMetadataBuilder = new WriteMetadataBuilder();\r
+        writeMetadataCaseBuilder.setWriteMetadata(writeMetadataBuilder.build());\r
+        insBuilder.setInstructionChoice(writeMetadataCaseBuilder.build());\r
         insIds.add(insBuilder.build());\r
+\r
         insBuilder = new InstructionBuilder();\r
-        insBuilder.setType(ApplyActions.class);\r
+        ApplyActionsCaseBuilder applyActionsCaseBuilder = new ApplyActionsCaseBuilder();\r
+        ApplyActionsBuilder applyActionsBuilder = new ApplyActionsBuilder();\r
+        applyActionsCaseBuilder.setApplyActions(applyActionsBuilder.build());\r
+        insBuilder.setInstructionChoice(applyActionsCaseBuilder.build());\r
         insIds.add(insBuilder.build());\r
+\r
         insBuilder = new InstructionBuilder();\r
-        insBuilder.setType(Meter.class);\r
+        MeterCaseBuilder meterCaseBuilder = new MeterCaseBuilder();\r
+        MeterBuilder meterBuilder = new MeterBuilder();\r
+        meterCaseBuilder.setMeter(meterBuilder.build());\r
+        insBuilder.setInstructionChoice(meterCaseBuilder.build());\r
         insIds.add(insBuilder.build());\r
+\r
+\r
         insBuilder = new InstructionBuilder();\r
-        insBuilder.setType(ClearActions.class);\r
+        ClearActionsCaseBuilder clearActionsCaseBuilder = new ClearActionsCaseBuilder();\r
+        insBuilder.setInstructionChoice(clearActionsCaseBuilder.build());\r
         insIds.add(insBuilder.build());\r
+\r
+\r
         insBuilder = new InstructionBuilder();\r
-        insBuilder.setType(GotoTable.class);\r
+        GotoTableCaseBuilder gotoCaseBuilder2 = new GotoTableCaseBuilder();\r
+        GotoTableBuilder gotoTableBuilder2 = new GotoTableBuilder();\r
+        gotoCaseBuilder2.setGotoTable(gotoTableBuilder2.build());\r
+        insBuilder.setInstructionChoice(gotoCaseBuilder2.build());\r
         insIds.add(insBuilder.build());\r
+\r
         insPropBuilder.setInstruction(insIds);\r
         propBuilder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insPropBuilder.build());\r
         properties.add(propBuilder.build());\r
@@ -221,171 +286,219 @@ public class TableFeaturesReplyConvertorTest {
         featuresBuilder.setMetadataWrite(metaWrite2);\r
         featuresBuilder.setConfig(new TableConfig(false));\r
         featuresBuilder.setMaxEntries(24L);\r
+\r
+        /* -------------------------------------------------- */\r
+\r
         properties = new ArrayList<>();\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTMATCH);\r
         OxmRelatedTableFeaturePropertyBuilder oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();\r
-        List<MatchEntries> entries = new ArrayList<>();\r
-        MatchEntriesBuilder entriesBuilder = new MatchEntriesBuilder();\r
+        List<MatchEntry> entries = new ArrayList<>();\r
+        MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(InPhyPort.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(InPort.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        oxmBuilder.setMatchEntries(entries);\r
+        oxmBuilder.setMatchEntry(entries);\r
         propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());\r
-        properties.add(propBuilder.build());\r
+        properties.add(propBuilder.build()); //[0]\r
+\r
+        /* -------------------------------------------------- */\r
+\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELD);\r
         oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();\r
         entries = new ArrayList<>();\r
-        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(IpProto.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(IpEcn.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        oxmBuilder.setMatchEntries(entries);\r
+        oxmBuilder.setMatchEntry(entries);\r
         propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());\r
-        properties.add(propBuilder.build());\r
+        properties.add(propBuilder.build());//[1]\r
+\r
+        /* -------------------------------------------------- */\r
+\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELD);\r
         oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();\r
         entries = new ArrayList<>();\r
-        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(Ipv6Exthdr.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(VlanVid.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        oxmBuilder.setMatchEntries(entries);\r
+        oxmBuilder.setMatchEntry(entries);\r
         propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());\r
-        properties.add(propBuilder.build());\r
+        properties.add(propBuilder.build());//[2]\r
+\r
+        /* -------------------------------------------------- */\r
+\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITESETFIELDMISS);\r
         oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();\r
         entries = new ArrayList<>();\r
-        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(VlanPcp.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(TcpSrc.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        oxmBuilder.setMatchEntries(entries);\r
+        oxmBuilder.setMatchEntry(entries);\r
         propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());\r
-        properties.add(propBuilder.build());\r
+        properties.add(propBuilder.build());//[3]\r
+\r
+        /* -------------------------------------------------- */\r
+\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS);\r
         oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();\r
         entries = new ArrayList<>();\r
-        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(UdpSrc.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        entriesBuilder = new MatchEntriesBuilder();\r
+\r
+        entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(UdpDst.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        oxmBuilder.setMatchEntries(entries);\r
+\r
+        oxmBuilder.setMatchEntry(entries);\r
         propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());\r
-        properties.add(propBuilder.build());\r
+        properties.add(propBuilder.build());//[4]\r
+\r
+        /* -------------------------------------------------- */\r
+\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWILDCARDS);\r
         oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();\r
         entries = new ArrayList<>();\r
-        entriesBuilder = new MatchEntriesBuilder();\r
+\r
+        entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(EthSrc.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        entriesBuilder = new MatchEntriesBuilder();\r
+\r
+        entriesBuilder = new MatchEntryBuilder();\r
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
         entriesBuilder.setOxmMatchField(EthDst.class);\r
         entriesBuilder.setHasMask(false);\r
         entries.add(entriesBuilder.build());\r
-        oxmBuilder.setMatchEntries(entries);\r
+\r
+        oxmBuilder.setMatchEntry(entries);\r
         propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());\r
-        properties.add(propBuilder.build());\r
+        properties.add(propBuilder.build());//[5]\r
+\r
+        /* -------------------------------------------------- */\r
+\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYACTIONS);\r
         ActionRelatedTableFeaturePropertyBuilder actBuilder = new ActionRelatedTableFeaturePropertyBuilder();\r
-        List<Action> actions = new ArrayList<>();\r
-        ActionBuilder actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(Output.class);\r
+        actions = new ArrayList<>();\r
+\r
+        actionBuilder = new ActionBuilder();\r
+        actionBuilder.setActionChoice(createSetNwSrcAction());\r
         actions.add(actionBuilder.build());\r
+\r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(PopPbb.class);\r
+        actionBuilder.setActionChoice(createSetNwSrcAction());\r
         actions.add(actionBuilder.build());\r
+\r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(SetNwTtl.class);\r
+        actionBuilder.setActionChoice(createSetNwSrcAction());\r
         actions.add(actionBuilder.build());\r
         actBuilder.setAction(actions);\r
         propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());\r
-        properties.add(propBuilder.build());\r
+        properties.add(propBuilder.build());//[6]\r
+\r
+        /* -------------------------------------------------- */\r
+\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTAPPLYACTIONSMISS);\r
         actBuilder = new ActionRelatedTableFeaturePropertyBuilder();\r
+\r
         actions = new ArrayList<>();\r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(Group.class);\r
+        actionBuilder.setActionChoice(createGroupAction());\r
         actions.add(actionBuilder.build());\r
+\r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(CopyTtlIn.class);\r
+        actionBuilder.setActionChoice(createCopyTtlInCase());\r
         actions.add(actionBuilder.build());\r
+\r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(CopyTtlOut.class);\r
+        actionBuilder.setActionChoice(createCopyTtlOutCase());\r
         actions.add(actionBuilder.build());\r
         actBuilder.setAction(actions);\r
         propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());\r
-        properties.add(propBuilder.build());\r
+        properties.add(propBuilder.build());//[7]\r
+\r
+        /* -------------------------------------------------- */\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITEACTIONS);\r
         actBuilder = new ActionRelatedTableFeaturePropertyBuilder();\r
+\r
         actions = new ArrayList<>();\r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(SetMplsTtl.class);\r
+        actionBuilder.setActionChoice(createSetMplsTtlCase());\r
         actions.add(actionBuilder.build());\r
+\r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(DecMplsTtl.class);\r
+        actionBuilder.setActionChoice(createDecMplsTtlCase());\r
         actions.add(actionBuilder.build());\r
+\r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(PushVlan.class);\r
+        actionBuilder.setActionChoice(pushVlanCase());\r
         actions.add(actionBuilder.build());\r
         actBuilder.setAction(actions);\r
+\r
         propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());\r
         properties.add(propBuilder.build());\r
+\r
+        /* -------------------------------------------------- */\r
+\r
         propBuilder = new TableFeaturePropertiesBuilder();\r
         propBuilder.setType(TableFeaturesPropType.OFPTFPTWRITEACTIONSMISS);\r
         actBuilder = new ActionRelatedTableFeaturePropertyBuilder();\r
+\r
         actions = new ArrayList<>();\r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(PopVlan.class);\r
+        actionBuilder.setActionChoice(createPopVlanCase());\r
         actions.add(actionBuilder.build());\r
+\r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(PushPbb.class);\r
+        actionBuilder.setActionChoice(createPushPbbCase());\r
         actions.add(actionBuilder.build());\r
+\r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(SetField.class);\r
+        actionBuilder.setActionChoice(createEmptySetFieldCase());\r
         actions.add(actionBuilder.build());\r
         actBuilder.setAction(actions);\r
+\r
         propBuilder.addAugmentation(ActionRelatedTableFeatureProperty.class, actBuilder.build());\r
         properties.add(propBuilder.build());\r
         featuresBuilder.setTableFeatureProperties(properties);\r
@@ -404,7 +517,7 @@ public class TableFeaturesReplyConvertorTest {
         Assert.assertEquals("Wrong max-entries", 42, feature.getMaxEntries().intValue());\r
         Assert.assertEquals("Wrong properties", 4, feature.getTableProperties().getTableFeatureProperties().size());\r
         org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features.table.properties\r
-        .TableFeatureProperties property = feature.getTableProperties().getTableFeatureProperties().get(0);\r
+                .TableFeatureProperties property = feature.getTableProperties().getTableFeatureProperties().get(0);\r
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.NextTable",\r
                 property.getTableFeaturePropType().getImplementedInterface().getName());\r
         NextTable propType = (NextTable) property.getTableFeaturePropType();\r
@@ -419,12 +532,13 @@ public class TableFeaturesReplyConvertorTest {
         ids = propType2.getTablesMiss().getTableIds();\r
         Assert.assertEquals("Wrong next table-id size", 1, ids.size());\r
         Assert.assertEquals("Wrong next-registry-id", 3, ids.get(0).intValue());\r
+\r
         property = feature.getTableProperties().getTableFeatureProperties().get(2);\r
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.Instructions",\r
                 property.getTableFeaturePropType().getImplementedInterface().getName());\r
         Instructions propType3 = (Instructions) property.getTableFeaturePropType();\r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list\r
-        .Instruction> instructionIds = propType3.getInstructions().getInstruction();\r
+                .Instruction> instructionIds = propType3.getInstructions().getInstruction();\r
         Assert.assertEquals("Wrong instruction-ids size", 2, instructionIds.size());\r
         Assert.assertEquals("Wrong instruction-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteActionsCase",\r
                 instructionIds.get(0).getInstruction().getImplementedInterface().getName());\r
@@ -446,6 +560,7 @@ public class TableFeaturesReplyConvertorTest {
                 instructionIds.get(3).getInstruction().getImplementedInterface().getName());\r
         Assert.assertEquals("Wrong instruction-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.GoToTableCase",\r
                 instructionIds.get(4).getInstruction().getImplementedInterface().getName());\r
+\r
         feature = list.get(1);\r
         Assert.assertEquals("Wrong table-id", 6, feature.getTableId().intValue());\r
         Assert.assertEquals("Wrong name", "Mahalo", feature.getName());\r
@@ -514,24 +629,26 @@ public class TableFeaturesReplyConvertorTest {
                 fieldMatch.get(0).getMatchType().getName());\r
         Assert.assertEquals("Wrong match-entry-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.EthDst",\r
                 fieldMatch.get(1).getMatchType().getName());\r
+\r
         property = feature.getTableProperties().getTableFeatureProperties().get(6);\r
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActions",\r
                 property.getTableFeaturePropType().getImplementedInterface().getName());\r
         org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type\r
-        .ApplyActions propType11 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActions) property.getTableFeaturePropType();\r
+                .ApplyActions propType11 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActions) property.getTableFeaturePropType();\r
         List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action> actionsList = propType11.getApplyActions().getAction();\r
         Assert.assertEquals("Wrong actions-ids size", 3, actionsList.size());\r
-        Assert.assertEquals("Wrong actions-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCase",\r
+        Assert.assertEquals("Wrong actions-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwSrcActionCase",\r
                 actionsList.get(0).getAction().getImplementedInterface().getName());\r
-        Assert.assertEquals("Wrong actions-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopPbbActionCase",\r
+        Assert.assertEquals("Wrong actions-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwSrcActionCase",\r
                 actionsList.get(1).getAction().getImplementedInterface().getName());\r
-        Assert.assertEquals("Wrong actions-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlActionCase",\r
+        Assert.assertEquals("Wrong actions-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwSrcActionCase",\r
                 actionsList.get(2).getAction().getImplementedInterface().getName());\r
+\r
         property = feature.getTableProperties().getTableFeatureProperties().get(7);\r
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActionsMiss",\r
                 property.getTableFeaturePropType().getImplementedInterface().getName());\r
         org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type\r
-        .ApplyActionsMiss propType12 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type\r
+                .ApplyActionsMiss propType12 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type\r
                 .ApplyActionsMiss) property.getTableFeaturePropType();\r
         actionsList = propType12.getApplyActionsMiss().getAction();\r
         Assert.assertEquals("Wrong actions-ids size", 3, actionsList.size());\r
@@ -544,8 +661,9 @@ public class TableFeaturesReplyConvertorTest {
         property = feature.getTableProperties().getTableFeatureProperties().get(8);\r
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteActions",\r
                 property.getTableFeaturePropType().getImplementedInterface().getName());\r
+\r
         org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type\r
-        .WriteActions propType13 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type\r
+                .WriteActions propType13 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type\r
                 .WriteActions) property.getTableFeaturePropType();\r
         actionsList = propType13.getWriteActions().getAction();\r
         Assert.assertEquals("Wrong actions-ids size", 3, actionsList.size());\r
@@ -558,8 +676,9 @@ public class TableFeaturesReplyConvertorTest {
         property = feature.getTableProperties().getTableFeatureProperties().get(9);\r
         Assert.assertEquals("Wrong property type", "org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WriteActionsMiss",\r
                 property.getTableFeaturePropType().getImplementedInterface().getName());\r
+\r
         org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type\r
-        .WriteActionsMiss propType14 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type\r
+                .WriteActionsMiss propType14 = (org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type\r
                 .WriteActionsMiss) property.getTableFeaturePropType();\r
         actionsList = propType14.getWriteActionsMiss().getAction();\r
         Assert.assertEquals("Wrong actions-ids size", 3, actionsList.size());\r
@@ -570,4 +689,79 @@ public class TableFeaturesReplyConvertorTest {
         Assert.assertEquals("Wrong actions-id", "org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCase",\r
                 actionsList.get(2).getAction().getImplementedInterface().getName());\r
     }\r
+\r
+    private final SetNwSrcCase createSetNwSrcAction() {\r
+        final SetNwSrcCaseBuilder setNwSrcCaseBuilder;\r
+        final SetNwSrcActionBuilder setNwSrcActionBuilder;\r
+        setNwSrcCaseBuilder = new SetNwSrcCaseBuilder();\r
+        setNwSrcActionBuilder = new SetNwSrcActionBuilder();\r
+        setNwSrcActionBuilder.setIpAddress(new Ipv4Address("1.2.3.4"));\r
+        setNwSrcCaseBuilder.setSetNwSrcAction(setNwSrcActionBuilder.build());\r
+        return setNwSrcCaseBuilder.build();\r
+    }\r
+\r
+    private final GroupCase createGroupAction() {\r
+        final GroupCaseBuilder groupCaseBuilder = new GroupCaseBuilder();\r
+        final GroupActionBuilder groupActionBuilder = new GroupActionBuilder();\r
+        groupActionBuilder.setGroupId(42L);\r
+        groupCaseBuilder.setGroupAction(groupActionBuilder.build());\r
+        return groupCaseBuilder.build();\r
+    }\r
+\r
+    private final CopyTtlInCase createCopyTtlInCase() {\r
+        CopyTtlInCaseBuilder copyTtlInCaseBuilder = new CopyTtlInCaseBuilder();\r
+        return copyTtlInCaseBuilder.build();\r
+    }\r
+\r
+    private final CopyTtlOutCase createCopyTtlOutCase() {\r
+        CopyTtlOutCaseBuilder copyTtlInCaseBuilder = new CopyTtlOutCaseBuilder();\r
+        return copyTtlInCaseBuilder.build();\r
+    }\r
+\r
+    private final SetMplsTtlCase createSetMplsTtlCase() {\r
+        SetMplsTtlCaseBuilder setMplsTtlCaseBuilder = new SetMplsTtlCaseBuilder();\r
+        SetMplsTtlActionBuilder setMplsTtlActionBuilder = new SetMplsTtlActionBuilder();\r
+        setMplsTtlActionBuilder.setMplsTtl((short) 42);\r
+        setMplsTtlCaseBuilder.setSetMplsTtlAction(setMplsTtlActionBuilder.build());\r
+        return setMplsTtlCaseBuilder.build();\r
+    }\r
+\r
+    private final DecMplsTtlCase createDecMplsTtlCase() {\r
+        DecMplsTtlCaseBuilder decMplsTtlCaseBuilder = new DecMplsTtlCaseBuilder();\r
+        return decMplsTtlCaseBuilder.build();\r
+    }\r
+\r
+    private final PushVlanCase pushVlanCase() {\r
+        PushVlanCaseBuilder pushVlanCaseBuilder = new PushVlanCaseBuilder();\r
+        PushVlanActionBuilder pushVlanActionBuilder = new PushVlanActionBuilder();\r
+        pushVlanActionBuilder.setEthertype(new EtherType(1));\r
+        pushVlanCaseBuilder.setPushVlanAction(pushVlanActionBuilder.build());\r
+        return pushVlanCaseBuilder.build();\r
+    }\r
+\r
+    private final PopVlanCase createPopVlanCase() {\r
+        PopVlanCaseBuilder popVlanCaseBuilder = new PopVlanCaseBuilder();\r
+        return popVlanCaseBuilder.build();\r
+    }\r
+\r
+    private final PushPbbCase createPushPbbCase() {\r
+        PushPbbCaseBuilder pushPbbCaseBuilder = new PushPbbCaseBuilder();\r
+        PushPbbActionBuilder pushPbbActionBuilder = new PushPbbActionBuilder();\r
+        pushPbbActionBuilder.setEthertype(new EtherType(1));\r
+        pushPbbCaseBuilder.setPushPbbAction(pushPbbActionBuilder.build());\r
+        return pushPbbCaseBuilder.build();\r
+    }\r
+\r
+    private final SetFieldCase createEmptySetFieldCase() {\r
+        SetFieldCaseBuilder setFieldCaseBuilder = new SetFieldCaseBuilder();\r
+        SetFieldActionBuilder setFieldActionBuilder = new SetFieldActionBuilder();\r
+        List<MatchEntry> matchEntries = new ArrayList();\r
+        MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();\r
+\r
+        matchEntries.add(matchEntryBuilder.build());\r
+        setFieldActionBuilder.setMatchEntry(matchEntries);\r
+        setFieldCaseBuilder.setSetFieldAction(setFieldActionBuilder.build());\r
+        return setFieldCaseBuilder.build();\r
+    }\r
+\r
 }
\ No newline at end of file
OpenFlow Plugin