BUG-2825: refactor to allow for embedding

IetfInetUtils acts as the frontend for both addresses and prefixes,
hence the conversion needs to fill a byte array and get the limits from
its caller.

Change-Id: Ie15723db8c8a6cd37131d9a082aa86c9d6b8e171
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>

diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java
index 43c2126942e1b9591687e69a8f39641ee080d3b1..5f2757083bddcb05070018d14b2199d5803ee157 100644 (file)
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java
@@ -54,38 +54,34 @@ final class Ipv6Utils {
     /**
      * Convert Ipv6Address object to a valid Canonical v6 address in byte format
      *
-     * @param addrStr IPv6 address string
-     * @return byte array of size 16 containing the binary IPv6 address
+     * @param bytes Byte array for output
+     * @param str String representation
+     * @param strLimit String offset which should not be processed
      * @throws NullPointerException if ipv6address is null
      */
-   public static @Nonnull byte[] bytesForString(final @Nonnull String addrStr) {
-       final int percentPos = addrStr.indexOf('%');
-       final int addrStrLen = percentPos == -1 ? addrStr.length() : percentPos;
-
+    static void fillIpv6Bytes(final @Nonnull byte[] bytes, final String str, final int strLimit) {
        // Leading :: requires some special handling.
        int i = 0;
-       if (addrStr.charAt(i) == ':') {
+       if (str.charAt(i) == ':') {
            // Note ++i side-effect in check
-           Preconditions.checkArgument(addrStr.charAt(++i) == ':', "Invalid v6 address '%s'", addrStr);
+           Preconditions.checkArgument(str.charAt(++i) == ':', "Invalid v6 address '%s'", str);
        }
 
-       final byte[] dst = new byte[INADDR6SZ];
-
        boolean haveVal = false;
        int val = 0;
        int colonp = -1;
        int j = 0;
        int curtok = i;
-       while (i < addrStrLen) {
-           final char ch = addrStr.charAt(i++);
+       while (i < strLimit) {
+           final char ch = str.charAt(i++);
 
            // v6 separator
            if (ch == ':') {
                curtok = i;
                if (haveVal) {
                    // removed overrun check - the regexp checks for valid data
-                   dst[j++] = (byte) ((val >>> 8) & 0xff);
-                   dst[j++] = (byte) (val & 0xff);
+                   bytes[j++] = (byte) ((val >>> 8) & 0xff);
+                   bytes[j++] = (byte) (val & 0xff);
                    haveVal = false;
                    val = 0;
                } else {
@@ -102,7 +98,7 @@ final class Ipv6Utils {
                 * This has passed the regexp so it is fairly safe to parse it
                 * straight away. Use the Ipv4Utils for that.
                 */
-               Ipv4Utils.fillIpv4Bytes(dst, j, addrStr, curtok, addrStrLen);
+               Ipv4Utils.fillIpv4Bytes(bytes, j, str, curtok, strLimit);
                j += INADDR4SZ;
                haveVal = false;
                break;
@@ -120,19 +116,17 @@ final class Ipv6Utils {
        }
 
        if (haveVal) {
-           Verify.verify(j + INT16SZ <= INADDR6SZ, "Overrun in parsing of '%s', should not occur", addrStr);
-           dst[j++] = (byte) ((val >> 8) & 0xff);
-           dst[j++] = (byte) (val & 0xff);
+           Verify.verify(j + INT16SZ <= INADDR6SZ, "Overrun in parsing of '%s', should not occur", str);
+           bytes[j++] = (byte) ((val >> 8) & 0xff);
+           bytes[j++] = (byte) (val & 0xff);
        }
 
        if (colonp != -1) {
-           Verify.verify(j != INADDR6SZ, "Overrun in parsing of '%s', should not occur", addrStr);
-           expandZeros(dst, colonp, j);
+           Verify.verify(j != INADDR6SZ, "Overrun in parsing of '%s', should not occur", str);
+           expandZeros(bytes, colonp, j);
        } else {
-           Verify.verify(j == INADDR6SZ, "Overrun in parsing of '%s', should not occur", addrStr);
+           Verify.verify(j == INADDR6SZ, "Overrun in parsing of '%s', should not occur", str);
        }
-
-       return dst;
    }
 
    private static void expandZeros(final byte[] bytes, final int where, final int filledBytes) {

diff --git a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/Ipv6UtilsTest.java b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/Ipv6UtilsTest.java
index 7828fbeb93476c5224f352aaf64095ad55e964a5..80ccbe525bbeee191d448539d833da1e12b19623 100644 (file)
--- a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/Ipv6UtilsTest.java
+++ b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/Ipv6UtilsTest.java
@@ -9,7 +9,7 @@ package org.opendaylight.mdsal.model.ietf.util;
 
 import static com.google.common.net.InetAddresses.forString;
 import static org.junit.Assert.assertArrayEquals;
-import static org.opendaylight.mdsal.model.ietf.util.Ipv6Utils.bytesForString;
+import static org.opendaylight.mdsal.model.ietf.util.Ipv6Utils.fillIpv6Bytes;
 import org.junit.Test;
 
 public class Ipv6UtilsTest {
@@ -30,11 +30,6 @@ public class Ipv6UtilsTest {
         assertEqualResult("0000:0000:0000:0000:0000:0000:0000:0001");
     }
 
-    @Test
-    public void testZoneIndex() {
-        assertArrayEquals(forString("::1").getAddress(), bytesForString("::1%2"));
-    }
-
     @Test
     public void testRfc4291() {
         assertEqualResult("ABCD:EF01:2345:6789:ABCD:EF01:2345:6789");
@@ -105,6 +100,12 @@ public class Ipv6UtilsTest {
         assertEqualResult("64:ff9b::192.0.2.33");
     }
 
+    private static byte[] bytesForString(final String str) {
+        final byte[] bytes = new byte[16];
+        fillIpv6Bytes(bytes, str, str.length());
+        return bytes;
+    }
+
     // Utility for quick comparison with Guava
     private static void assertEqualResult(final String str) {
         assertArrayEquals(forString(str).getAddress(), bytesForString(str));