Code Review / openflowjava.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Minor model refactor
[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / util / ActionsSerializerTest.java
diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsSerializerTest.java
index 29c0e5517f5e3279e13e77e3dfb8c7776125ca78..20d5e17969d2bf5bad318e4f03aecc19db6feb5b 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsSerializerTest.java
@@ -52,15 +52,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
 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.SetQueue;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.ActionsList;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.ActionsListBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.ActionBuilder;\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.types.rev130731.EtherType;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;\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.OpenflowBasicClass;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.MatchEntries;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.MatchEntriesBuilder;\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
 \r
 /**\r
  * @author michal.polkorab\r
@@ -73,8 +72,7 @@ public class ActionsSerializerTest {
      */\r
     @Test\r
     public void test() {\r
-        List<ActionsList> actions = new ArrayList<>();\r
-        ActionsListBuilder listBuilder = new ActionsListBuilder();\r
+        List<Action> actions = new ArrayList<>();\r
         ActionBuilder actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(Output.class);\r
         PortActionBuilder port = new PortActionBuilder();\r
@@ -83,90 +81,64 @@ public class ActionsSerializerTest {
         MaxLengthActionBuilder maxLen = new MaxLengthActionBuilder();\r
         maxLen.setMaxLength(52);\r
         actionBuilder.addAugmentation(MaxLengthAction.class, maxLen.build());\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(CopyTtlOut.class);\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(CopyTtlIn.class);\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(SetMplsTtl.class);\r
         MplsTtlActionBuilder mplsTtl = new MplsTtlActionBuilder();\r
         mplsTtl.setMplsTtl((short) 4);\r
         actionBuilder.addAugmentation(MplsTtlAction.class, mplsTtl.build());\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(DecMplsTtl.class);\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(PushVlan.class);\r
         EthertypeActionBuilder etherType = new EthertypeActionBuilder();\r
         etherType.setEthertype(new EtherType(16));\r
         actionBuilder.addAugmentation(EthertypeAction.class, etherType.build());\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(PopVlan.class);\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(PushMpls.class);\r
         etherType = new EthertypeActionBuilder();\r
         etherType.setEthertype(new EtherType(17));\r
         actionBuilder.addAugmentation(EthertypeAction.class, etherType.build());\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(PopMpls.class);\r
         etherType = new EthertypeActionBuilder();\r
         etherType.setEthertype(new EtherType(18));\r
         actionBuilder.addAugmentation(EthertypeAction.class, etherType.build());\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(SetQueue.class);\r
         QueueIdActionBuilder queueId = new QueueIdActionBuilder();\r
         queueId.setQueueId(1234L);\r
         actionBuilder.addAugmentation(QueueIdAction.class, queueId.build());\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(Group.class);\r
         GroupIdActionBuilder group = new GroupIdActionBuilder();\r
         group.setGroupId(555L);\r
         actionBuilder.addAugmentation(GroupIdAction.class, group.build());\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(SetNwTtl.class);\r
         NwTtlActionBuilder nwTtl = new NwTtlActionBuilder();\r
         nwTtl.setNwTtl((short) 8);\r
         actionBuilder.addAugmentation(NwTtlAction.class, nwTtl.build());\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(DecNwTtl.class);\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(SetField.class);\r
         OxmFieldsActionBuilder matchEntries = new OxmFieldsActionBuilder();\r
@@ -181,29 +153,22 @@ public class ActionsSerializerTest {
         entries.add(matchBuilder.build());\r
         matchEntries.setMatchEntries(entries);\r
         actionBuilder.addAugmentation(OxmFieldsAction.class, matchEntries.build());\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(PushPbb.class);\r
         etherType = new EthertypeActionBuilder();\r
         etherType.setEthertype(new EtherType(19));\r
         actionBuilder.addAugmentation(EthertypeAction.class, etherType.build());\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(PopPbb.class);\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
+        actions.add(actionBuilder.build());\r
         actionBuilder = new ActionBuilder();\r
         actionBuilder.setType(Experimenter.class);\r
         ExperimenterActionBuilder experimenter = new ExperimenterActionBuilder();\r
         experimenter.setExperimenter(4L);\r
         actionBuilder.addAugmentation(ExperimenterAction.class, experimenter.build());\r
-        listBuilder.setAction(actionBuilder.build());\r
-        actions.add(listBuilder.build());\r
+        actions.add(actionBuilder.build());\r
         \r
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();\r
         ActionsSerializer.encodeActions(actions, out);\r
Opendaylight Openflow Protocol Library