Code Review / openflowjava.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Factory tests back to stable
[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / deserialization / factories / MultipartReplyMessageFactoryTest.java
diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java
index a20374d4719e94caf722719e6cee9924bdb848a1..c10c4ac5bba0ddd1e56b145f8196099efcfa378b 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java
@@ -11,7 +11,6 @@ import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
 import org.opendaylight.openflowjava.protocol.impl.util.ByteBufUtils;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeAction;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterAction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.GroupIdAction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaxLengthAction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MplsTtlAction;\r
@@ -24,7 +23,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
 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.DecNwTtl;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Experimenter;\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.PopMpls;\r
@@ -42,7 +40,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortState;\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.OpenflowBasicClass;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReplyMessage;\r
@@ -62,6 +59,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyPortStats;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyQueue;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyTable;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 \r
 /**\r
  * @author timotej.kubas\r
@@ -69,6 +68,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  */\r
 public class MultipartReplyMessageFactoryTest {\r
 \r
+    private static final Logger LOGGER = LoggerFactory\r
+            .getLogger(MultipartReplyMessageFactoryTest.class);\r
+    \r
     /**\r
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO\r
      *//*\r
@@ -851,11 +853,10 @@ public class MultipartReplyMessageFactoryTest {
                                                 message.getPorts().get(0).getHwAddr());\r
         Assert.assertEquals("Wrong portName", "SampleText", \r
                                                 message.getPorts().get(0).getName());\r
-        //TODO - fix test\r
-        //Assert.assertEquals("Wrong portConfig", new PortConfig(false, true, false, true), \r
-        //                                        message.getPorts().get(0).getConfig());\r
-        //Assert.assertEquals("Wrong portState", new PortState(true, false, true), \r
-        //                                       message.getPorts().get(0).getState());\r
+        Assert.assertEquals("Wrong portConfig", new PortConfig(false, true, false, true), \r
+                message.getPorts().get(0).getConfig());\r
+        Assert.assertEquals("Wrong portState", new PortState(false, true, true),\r
+                                               message.getPorts().get(0).getState());\r
         Assert.assertEquals("Wrong currentFeatures", new PortFeatures(true, false, false, false,\r
                                                                       false, false, false, true, \r
                                                                       false, false, false, false, \r
@@ -911,7 +912,6 @@ public class MultipartReplyMessageFactoryTest {
                                               "00 08 "+//copyTTLIntLen\r
                                               "00 00 00 00"//copyTTLInPad\r
                                               );\r
-        \r
         MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb);\r
         \r
         BufferHelper.checkHeaderV13(builtByFactory);\r
@@ -1156,15 +1156,14 @@ public class MultipartReplyMessageFactoryTest {
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO\r
      * Test covers bodies of actions NW TTL, Experimenter\r
      */\r
-    //@Test\r
-    // TODO - fix test\r
+    @Test\r
     public void testMultipartReplyGroupDescBody04(){\r
         ByteBuf bb = BufferHelper.buildBuffer("00 07 00 01 00 00 00 00 "+\r
-                                              "00 3C "+//len\r
+                                              "00 30 "+//len\r
                                               "01 "+//type\r
                                               "00 "+//pad\r
                                               "00 00 00 08 "+//groupId\r
-                                              "00 34 "+//bucketLen\r
+                                              "00 28 "+//bucketLen\r
                                               "00 06 "+//bucketWeight\r
                                               "00 00 00 05 "+//bucketWatchPort\r
                                               "00 00 00 04 "+//bucketWatchGroup\r
@@ -1173,21 +1172,14 @@ public class MultipartReplyMessageFactoryTest {
                                               "00 08 "+//nwTTlLen\r
                                               "0E "+//nwTTlnwTTL\r
                                               "00 00 00 "+//nwTTlPad\r
-                                              "FF FF "+//experimenterType\r
-                                              "00 08 "+//experimenterLen\r
-                                              "00 01 02 03 "+//experimenterExperimenter\r
                                               "00 19 "+//setFieldType\r
-                                              "00 14 "+//setFieldLen\r
+                                              "00 10 "+//setFieldLen\r
                                               "80 00 "+//setFieldOXMClass\r
                                               "00 "+//setFieldOXMField\r
                                               "04 "+//setFieldOXMLength\r
-                                              "00 00 00 FF "+//setFieldPort\r
-                                              \r
-                                              "80 00 "+//setFieldOXMClass\r
-                                              "03 "+//setFieldOXMField\r
-                                              "04 "+//setFieldOXMLength\r
-                                              "00 00 0F FF"//setFieldPort\r
-                                              );\r
+                                              "00 00 00 FF "+ //setFieldPort\r
+                                              "00 00 00 00"\r
+                );\r
         \r
         MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb);\r
         \r
@@ -1217,43 +1209,21 @@ public class MultipartReplyMessageFactoryTest {
                 message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(0).\r
                 getAction().getAugmentation(NwTtlAction.class).getNwTtl().intValue());\r
         \r
-        Assert.assertEquals("Wrong experimenterType", Experimenter.class, \r
-                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1).\r
-                getAction().getType());\r
-        \r
-        Assert.assertEquals("Wrong experimenterExperimenter", 66051, \r
-                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1).\r
-                getAction().getAugmentation(ExperimenterAction.class).getExperimenter().intValue());\r
-        \r
         Assert.assertEquals("Wrong setFieldType", SetField.class, \r
-                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2).\r
+                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1).\r
                 getAction().getType());\r
         \r
         Assert.assertEquals("Wrong setFieldOXMClass", OpenflowBasicClass.class, \r
-                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2).\r
+                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1).\r
                 getAction().getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).getOxmClass());\r
         \r
         Assert.assertEquals("Wrong setFieldOXMField", InPort.class, \r
-                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2).\r
+                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1).\r
                 getAction().getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).getOxmMatchField());\r
         \r
-        Assert.assertEquals("Wrong setFieldOXMField", 255, \r
-                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2).\r
+        Assert.assertEquals("Wrong setFieldOXMValue", 255, \r
+                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1).\r
                 getAction().getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).\r
                 getAugmentation(PortNumberMatchEntry.class).getPortNumber().getValue().intValue());\r
-        \r
-        \r
-        Assert.assertEquals("Wrong setFieldOXMClass", OpenflowBasicClass.class, \r
-                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2).\r
-                getAction().getAugmentation(OxmFieldsAction.class).getMatchEntries().get(1).getOxmClass());\r
-        \r
-        Assert.assertEquals("Wrong setFieldOXMField", InPhyPort.class, \r
-                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2).\r
-                getAction().getAugmentation(OxmFieldsAction.class).getMatchEntries().get(1).getOxmMatchField());\r
-        \r
-        Assert.assertEquals("Wrong setFieldOXMField", 4095, \r
-                message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2).\r
-                getAction().getAugmentation(OxmFieldsAction.class).getMatchEntries().get(1).\r
-                getAugmentation(PortNumberMatchEntry.class).getPortNumber().getValue().intValue());\r
     }\r
 }\r
Opendaylight Openflow Protocol Library