BUG-2794: Incorporated model Action api changes in OFJava to openflowplugin

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / translator / MultipartReplyTranslatorFourthTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFourthTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFourthTest.java
index 50494cc3f6a4612fb8f8bfadc2a2a42ce2c55052..93f22e9ae74b3058124cb96df1026f7e1392feeb 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFourthTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFourthTest.java
@@ -21,17 +21,18 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;\r
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
 import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher;\r
-import org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductor;\r
-import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContext;\r
+import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor;\r
+import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupDescStatsUpdated;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupStatisticsUpdated;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.Bucket;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStats;\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.PopPbb;\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.action.rev150203.action.grouping.action.choice.DecMplsTtlCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.PopPbbCaseBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping.action.choice.SetNwDstCaseBuilder;\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.types.rev130731.GroupId;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupType;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartRequestFlags;\r
@@ -245,13 +246,18 @@ public class MultipartReplyTranslatorFourthTest {
         bucketBuilder.setWeight(28);\r
         bucketBuilder.setWatchPort(new PortNumber(56L));\r
         bucketBuilder.setWatchGroup(112L);\r
+        \r
         List<Action> actions = new ArrayList<>();\r
         ActionBuilder actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(DecMplsTtl.class);\r
+        DecMplsTtlCaseBuilder decMplsTtlCaseBuilder = new DecMplsTtlCaseBuilder();\r
+        actionBuilder.setActionChoice(decMplsTtlCaseBuilder.build());\r
         actions.add(actionBuilder.build());\r
+        \r
         actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(PopPbb.class);\r
+        PopPbbCaseBuilder popPbbCaseBuilder = new PopPbbCaseBuilder();\r
+        actionBuilder.setActionChoice(popPbbCaseBuilder.build());\r
         actions.add(actionBuilder.build());\r
+        \r
         bucketBuilder.setAction(actions);\r
         buckets.add(bucketBuilder.build());\r
         bucketBuilder = new BucketsListBuilder();\r