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 / InstructionsSerializerTest.java
diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsSerializerTest.java
index 7a90123ac48d6558a35e3d906d497d5245ce938e..192d1950d3191298abe628852ea92c679148c499 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsSerializerTest.java
@@ -13,9 +13,6 @@ import io.netty.buffer.UnpooledByteBufAllocator;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-\r
-\r
-\r
 import org.junit.Assert;\r
 import org.junit.Test;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ActionsInstruction;\r
@@ -38,17 +35,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
 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.PushVlan;\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.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.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.opendaylight.openflow.common.instruction.rev130731.instructions.Instructions;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.InstructionsBuilder;\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.PortNumber;\r
 \r
@@ -63,15 +59,15 @@ public class InstructionsSerializerTest {
      */\r
     @Test\r
     public void test() {\r
-        List<Instructions> instructions = new ArrayList<>();\r
+        List<Instruction> instructions = new ArrayList<>();\r
         // Goto_table instruction\r
-        InstructionsBuilder builder = new InstructionsBuilder();\r
+        InstructionBuilder builder = new InstructionBuilder();\r
         builder.setType(GotoTable.class);\r
         TableIdInstructionBuilder tableIdBuilder = new TableIdInstructionBuilder();\r
         tableIdBuilder.setTableId((short) 5);\r
         builder.addAugmentation(TableIdInstruction.class, tableIdBuilder.build());\r
         instructions.add(builder.build());\r
-        builder = new InstructionsBuilder();\r
+        builder = new InstructionBuilder();\r
         // Write_metadata instruction\r
         builder.setType(WriteMetadata.class);\r
         MetadataInstructionBuilder metaBuilder = new MetadataInstructionBuilder();\r
@@ -80,62 +76,54 @@ public class InstructionsSerializerTest {
         builder.addAugmentation(MetadataInstruction.class, metaBuilder.build());\r
         instructions.add(builder.build());\r
         // Clear_actions instruction\r
-        builder = new InstructionsBuilder();\r
+        builder = new InstructionBuilder();\r
         builder.setType(ClearActions.class);\r
         instructions.add(builder.build());\r
         // Meter instruction\r
-        builder = new InstructionsBuilder();\r
+        builder = new InstructionBuilder();\r
         builder.setType(Meter.class);\r
         MeterIdInstructionBuilder meterBuilder = new MeterIdInstructionBuilder();\r
         meterBuilder.setMeterId(42L);\r
         builder.addAugmentation(MeterIdInstruction.class, meterBuilder.build());\r
         instructions.add(builder.build());\r
         // Write_actions instruction\r
-        builder = new InstructionsBuilder();\r
+        builder = new InstructionBuilder();\r
         builder.setType(WriteActions.class);\r
         ActionsInstructionBuilder actionsBuilder = new ActionsInstructionBuilder();\r
-        List<ActionsList> actions = new ArrayList<>();\r
-        ActionsListBuilder listBuilder = new ActionsListBuilder();\r
-        ActionBuilder actBuilder = new ActionBuilder();\r
-        actBuilder.setType(Output.class);\r
+        List<Action> actions = new ArrayList<>();\r
+        ActionBuilder actionBuilder = new ActionBuilder();\r
+        actionBuilder.setType(Output.class);\r
         PortActionBuilder portBuilder = new PortActionBuilder();\r
         portBuilder.setPort(new PortNumber(45L));\r
-        actBuilder.addAugmentation(PortAction.class, portBuilder.build());\r
+        actionBuilder.addAugmentation(PortAction.class, portBuilder.build());\r
         MaxLengthActionBuilder maxBuilder = new MaxLengthActionBuilder();\r
         maxBuilder.setMaxLength(55);\r
-        actBuilder.addAugmentation(MaxLengthAction.class, maxBuilder.build());\r
-        listBuilder.setAction(actBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
-        actBuilder = new ActionBuilder();\r
-        actBuilder.setType(SetNwTtl.class);\r
+        actionBuilder.addAugmentation(MaxLengthAction.class, maxBuilder.build());\r
+        actions.add(actionBuilder.build());\r
+        actionBuilder = new ActionBuilder();\r
+        actionBuilder.setType(SetNwTtl.class);\r
         NwTtlActionBuilder nwTtl = new NwTtlActionBuilder();\r
         nwTtl.setNwTtl((short) 64);\r
-        actBuilder.addAugmentation(NwTtlAction.class, nwTtl.build());\r
-        listBuilder.setAction(actBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        actionsBuilder.setActionsList(actions);\r
+        actionBuilder.addAugmentation(NwTtlAction.class, nwTtl.build());\r
+        actions.add(actionBuilder.build());\r
+        actionsBuilder.setAction(actions);\r
         builder.addAugmentation(ActionsInstruction.class, actionsBuilder.build());\r
         instructions.add(builder.build());\r
         // Apply_actions instruction\r
-        builder = new InstructionsBuilder();\r
+        builder = new InstructionBuilder();\r
         builder.setType(ApplyActions.class);\r
         actionsBuilder = new ActionsInstructionBuilder();\r
         actions = new ArrayList<>();\r
-        listBuilder = new ActionsListBuilder();\r
-        actBuilder = new ActionBuilder();\r
-        actBuilder.setType(PushVlan.class);\r
+        actionBuilder = new ActionBuilder();\r
+        actionBuilder.setType(PushVlan.class);\r
         EthertypeActionBuilder ethertypeBuilder = new EthertypeActionBuilder();\r
         ethertypeBuilder.setEthertype(new EtherType(14));\r
-        actBuilder.addAugmentation(EthertypeAction.class, ethertypeBuilder.build());\r
-        listBuilder.setAction(actBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        listBuilder = new ActionsListBuilder();\r
-        actBuilder = new ActionBuilder();\r
-        actBuilder.setType(PopPbb.class);\r
-        listBuilder.setAction(actBuilder.build());\r
-        actions.add(listBuilder.build());\r
-        actionsBuilder.setActionsList(actions);\r
+        actionBuilder.addAugmentation(EthertypeAction.class, ethertypeBuilder.build());\r
+        actions.add(actionBuilder.build());\r
+        actionBuilder = new ActionBuilder();\r
+        actionBuilder.setType(PopPbb.class);\r
+        actions.add(actionBuilder.build());\r
+        actionsBuilder.setAction(actions);\r
         builder.addAugmentation(ActionsInstruction.class, actionsBuilder.build());\r
         instructions.add(builder.build());\r
         \r
Opendaylight Openflow Protocol Library