X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=model%2Fietf%2Fietf-type-util%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fmodel%2Fietf%2Futil%2FAbstractIetfInetUtilTest.java;h=ab6796150c1bf2e2d31a1725a13713db36c67fe8;hb=1d8897caf5cec5f044f870f949a15fa57de54d71;hp=ba19adc47faf5fe2ed33fe5c28be4ef5e4583f11;hpb=0f351bbc28ddf2cddfe30c8d018646d81953fa17;p=mdsal.git

diff --git a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtilTest.java b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtilTest.java
index ba19adc47f..ab6796150c 100644
--- a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtilTest.java
+++ b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtilTest.java
@@ -137,6 +137,11 @@ public class AbstractIetfInetUtilTest {
         assertTrue(UTIL.splitIpv6Prefix(new IpClass("::/32")).getValue().equals(32));
         assertArrayEquals(new byte[] { 0, 10, 0, 0, 0, 0, 0, 0, 0, 11, 0, 12, 0, 13, 0, 14, 64 },
                 UTIL.ipv6PrefixToBytes(new IpClass("A::B:C:D:E/64")));
+
+        // verify that an IPv4-mapped IPv6 address gets parsed as an IPv6 address
+        assertEquals("::ffff:ab0:eb", UTIL.ipv6AddressFor(
+                new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (byte) 0xff, (byte) 0xff, 0x0a, (byte) 0xb0, 0, (byte) 0xeb})
+                .getValue());
     }
 
     @Test
@@ -175,4 +180,28 @@ public class AbstractIetfInetUtilTest {
         }).when(ipClass).getValue();
         UTIL.inet6AddressFor(ipClass);
     }
-}
\ No newline at end of file
+
+    @Test
+    public void testIpv4AddressForBits() {
+        assertEquals("1.2.3.4", UTIL.ipv4AddressFor(0x01020304).getValue());
+        assertEquals("255.255.255.255", UTIL.ipv4AddressFor(0xFFFFFFFF).getValue());
+    }
+
+    @Test
+    public void testIpv4AddressNoZoneForBits() {
+        assertEquals("1.2.3.4", UTIL.ipv4AddressNoZoneFor(0x01020304).getValue());
+        assertEquals("255.255.255.255", UTIL.ipv4AddressNoZoneFor(0xFFFFFFFF).getValue());
+    }
+
+    @Test
+    public void testIpv4AddressBits() {
+        assertEquals(0x01020304, UTIL.ipv4AddressBits(new IpClass("1.2.3.4")));
+        assertEquals(0xFFFFFFFF, UTIL.ipv4AddressBits(new IpClass("255.255.255.255")));
+    }
+
+    @Test
+    public void testIpv4AddressNoZoneBits() {
+        assertEquals(0x01020304, UTIL.ipv4AddressNoZoneBits(new IpClass("1.2.3.4")));
+        assertEquals(0xFFFFFFFF, UTIL.ipv4AddressNoZoneBits(new IpClass("255.255.255.255")));
+    }
+}