Bug-5562 - Ipv4 L3-ArbitraryMask patch

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / IpConversionUtilTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtilTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtilTest.java
index c65fb40b366d6a2e54bdedb41147bafd577db8a7..f74fb152d1470985f532cddddfe28922dff4588c 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtilTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtilTest.java
@@ -13,6 +13,8 @@ import org.junit.Assert;
 import org.junit.Test;\r
 import org.opendaylight.openflowjava.util.ByteBufUtils;\r
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.MatchConvertorUtil;\r
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;\r
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Address;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Prefix;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DottedQuad;\r
@@ -115,7 +117,7 @@ public class IpConversionUtilTest {
                 (byte)(value >>> 24), (byte)(value >> 16 & 0xff), (byte)(value >> 8 & 0xff), (byte)(value & 0xff) };\r
         byte[] maskBytes;\r
         maskBytes = IpConversionUtil.convertArbitraryMaskToByteArray(new DottedQuad("255.255.255.255"));\r
-        for(int i=0; i<bytes.length;i++){\r
+        for (int i=0; i<bytes.length;i++) {\r
             int mask = maskBytes[i];\r
             Assert.assertEquals(bytes[i],mask);\r
         }\r
@@ -133,4 +135,18 @@ public class IpConversionUtilTest {
         arbitraryBitMask = IpConversionUtil.isArbitraryBitMask(null);\r
         Assert.assertEquals(arbitraryBitMask,false);\r
     }\r
+\r
+    @Test\r
+    public void extractIpv4AddressTest() {\r
+        Ipv4Address ipv4Address;\r
+        ipv4Address = IpConversionUtil.extractIpv4Address(new Ipv4Prefix("1.0.1.0/16"));\r
+        Assert.assertEquals(ipv4Address.getValue(),"1.0.1.0");\r
+    }\r
+\r
+    @Test\r
+    public void extractIpv4AddressMaskTest() {\r
+        DottedQuad dottedQuad;\r
+        dottedQuad = IpConversionUtil.extractIpv4AddressMask(new Ipv4Prefix("1.1.1.1/24"));\r
+        Assert.assertEquals(dottedQuad.getValue(),"255.255.255.0");\r
+    }\r
 }\r