BUG 2281 - Incorrect IP address conversion

It looks like reported problem (do not cut the ip mask off) was fixed. Test is passing after uncommenting commented parts.

Change-Id: If81e4f675ac2bae25d57a18a14cf3e3802faecea
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorV10Test.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorV10Test.java
index 38d698a9e497cb9ac1b67a93bc20f06c24b714d3..2d4ca9d26164f64ff714ce608e57033ed9eafc0a 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorV10Test.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorV10Test.java
@@ -52,6 +52,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanPcp;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.IpMatchBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.DlAddressAction;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.IpAddressAction;\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.MaxLengthActionBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.NwTosAction;\r
@@ -185,15 +186,13 @@ public class ActionConvertorV10Test {
         action = actions.get(4);\r
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"\r
                 + ".action.rev130731.SetNwSrc", action.getType().getName());\r
-        // FIXME - fix ipv4 address translation - cut off network mask\r
-//        Assert.assertEquals("Wrong nw src", "10.0.0.1", action.getAugmentation(IpAddressAction.class)\r
-//                .getIpAddress().getValue());\r
+        Assert.assertEquals("Wrong nw src", "10.0.0.1", action.getAugmentation(IpAddressAction.class)\r
+                .getIpAddress().getValue());\r
         action = actions.get(5);\r
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"\r
                 + ".action.rev130731.SetNwDst", action.getType().getName());\r
-        // FIXME - fix ipv4 address translation - cut off network mask\r
-//        Assert.assertEquals("Wrong nw dst", "10.0.0.2", action.getAugmentation(IpAddressAction.class)\r
-//                .getIpAddress().getValue());\r
+        Assert.assertEquals("Wrong nw dst", "10.0.0.2", action.getAugmentation(IpAddressAction.class)\r
+                .getIpAddress().getValue());\r
         action = actions.get(6);\r
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common"\r
                 + ".action.rev130731.SetTpSrc", action.getType().getName());\r