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 / InstructionsDeserializerTest.java
diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java
index e26672fb2db1f46351938cc5f3be00c06bc11127..d65b95525be6390c6544a5e07c0f9434f77afc01 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java
@@ -22,8 +22,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortAction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.QueueIdAction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.TableIdInstruction;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.actions.list.Action;\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.action.rev130731.actions.grouping.Action;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction;\r
 \r
 /**\r
  * @author michal.polkorab\r
@@ -42,48 +42,48 @@ public class InstructionsDeserializerTest {
                 + "00 16 00 08 00 00 00 50 00 04 00 18 00 00 00 00 00 15 00 08 00 00 00 25 00 0F 00 08 05 00 00 00");\r
         \r
         message.skipBytes(4); // skip XID\r
-        List<Instructions> instructions = InstructionsDeserializer.createInstructions(message, message.readableBytes());\r
-        Instructions i1 = instructions.get(0);\r
+        List<Instruction> instructions = InstructionsDeserializer.createInstructions(message, message.readableBytes());\r
+        Instruction i1 = instructions.get(0);\r
         Assert.assertEquals("Wrong type - i1", "org.opendaylight.yang.gen.v1.urn."\r
                 + "opendaylight.openflow.common.instruction.rev130731.GotoTable", i1.getType().getName());\r
         Assert.assertEquals("Wrong table-id - i1", 10, i1.getAugmentation(TableIdInstruction.class).getTableId().intValue());\r
-        Instructions i2 = instructions.get(1);\r
+        Instruction i2 = instructions.get(1);\r
         Assert.assertEquals("Wrong type - i2", "org.opendaylight.yang.gen.v1.urn."\r
                 + "opendaylight.openflow.common.instruction.rev130731.WriteMetadata", i2.getType().getName());\r
         Assert.assertArrayEquals("Wrong metadata - i2", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 20"),\r
                 i2.getAugmentation(MetadataInstruction.class).getMetadata());\r
         Assert.assertArrayEquals("Wrong metadata-mask - i2", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 30"),\r
                 i2.getAugmentation(MetadataInstruction.class).getMetadataMask());\r
-        Instructions i3 = instructions.get(2);\r
+        Instruction i3 = instructions.get(2);\r
         Assert.assertEquals("Wrong type - i3", "org.opendaylight.yang.gen.v1.urn."\r
                 + "opendaylight.openflow.common.instruction.rev130731.ClearActions", i3.getType().getName());\r
-        Assert.assertEquals("Wrong instructions - i3", 0, i3.getAugmentation(ActionsInstruction.class).getActionsList().size());\r
-        Instructions i4 = instructions.get(3);\r
+        Assert.assertEquals("Wrong instructions - i3", 0, i3.getAugmentation(ActionsInstruction.class).getAction().size());\r
+        Instruction i4 = instructions.get(3);\r
         Assert.assertEquals("Wrong type - i4", "org.opendaylight.yang.gen.v1.urn."\r
                 + "opendaylight.openflow.common.instruction.rev130731.Meter", i4.getType().getName());\r
         Assert.assertEquals("Wrong meterId - i4", 66051, i4.getAugmentation(MeterIdInstruction.class).getMeterId().intValue());\r
-        Instructions i5 = instructions.get(4);\r
+        Instruction i5 = instructions.get(4);\r
         Assert.assertEquals("Wrong type - i5", "org.opendaylight.yang.gen.v1.urn."\r
                 + "opendaylight.openflow.common.instruction.rev130731.WriteActions", i5.getType().getName());\r
-        Assert.assertEquals("Wrong instructions - i5", 2, i5.getAugmentation(ActionsInstruction.class).getActionsList().size());\r
-        Action action1 = i5.getAugmentation(ActionsInstruction.class).getActionsList().get(0).getAction();\r
+        Assert.assertEquals("Wrong instructions - i5", 2, i5.getAugmentation(ActionsInstruction.class).getAction().size());\r
+        Action action1 = i5.getAugmentation(ActionsInstruction.class).getAction().get(0);\r
         Assert.assertEquals("Wrong action", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output",\r
                 action1.getType().getName());\r
         Assert.assertEquals("Wrong action", 37, action1.getAugmentation(PortAction.class).getPort().getValue().intValue());\r
         Assert.assertEquals("Wrong action", 53, action1.getAugmentation(MaxLengthAction.class).getMaxLength().intValue());\r
-        Action action2 = i5.getAugmentation(ActionsInstruction.class).getActionsList().get(1).getAction();\r
+        Action action2 = i5.getAugmentation(ActionsInstruction.class).getAction().get(1);\r
         Assert.assertEquals("Wrong action", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Group",\r
                 action2.getType().getName());\r
         Assert.assertEquals("Wrong action", 80, action2.getAugmentation(GroupIdAction.class).getGroupId().intValue());\r
-        Instructions i6 = instructions.get(5);\r
+        Instruction i6 = instructions.get(5);\r
         Assert.assertEquals("Wrong type - i6", "org.opendaylight.yang.gen.v1.urn."\r
                 + "opendaylight.openflow.common.instruction.rev130731.ApplyActions", i6.getType().getName());\r
-        Assert.assertEquals("Wrong instructions - i6", 2, i6.getAugmentation(ActionsInstruction.class).getActionsList().size());\r
-        action1 = i6.getAugmentation(ActionsInstruction.class).getActionsList().get(0).getAction();\r
+        Assert.assertEquals("Wrong instructions - i6", 2, i6.getAugmentation(ActionsInstruction.class).getAction().size());\r
+        action1 = i6.getAugmentation(ActionsInstruction.class).getAction().get(0);\r
         Assert.assertEquals("Wrong action", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetQueue",\r
                 action1.getType().getName());\r
         Assert.assertEquals("Wrong action", 37, action1.getAugmentation(QueueIdAction.class).getQueueId().intValue());\r
-        action2 = i6.getAugmentation(ActionsInstruction.class).getActionsList().get(1).getAction();\r
+        action2 = i6.getAugmentation(ActionsInstruction.class).getAction().get(1);\r
         Assert.assertEquals("Wrong action", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetMplsTtl",\r
                 action2.getType().getName());\r
         Assert.assertEquals("Wrong action", 5, action2.getAugmentation(MplsTtlAction.class).getMplsTtl().intValue());\r
Opendaylight Openflow Protocol Library