Add DottedQuad/int interface

DottedQuad is essentially an Ipv4Address, hence we should have
the same level of support. Add interface to create DottedQuad from
bits and serialize it to bits.

JIRA: MDSAL-509
Change-Id: I9cee4afa1993a0090f10b3969152344e03e9adc0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 4e1311cbb83dd15f2da7936385dd9384b6dc0229)

diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java
index 88da958305a9e62cec3b41cf9c465939010027fd..87c5beb893a756640cb44088592681fd111317b8 100644 (file)
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java
@@ -257,7 +257,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @return An Ipv4Address object
      */
     public final @NonNull A4 ipv4AddressFor(final int bits) {
-        return address4Factory.newInstance(addressString(bits));
+        return address4Factory.newInstance(Ipv4Utils.addressString(bits));
     }
 
     /**
@@ -293,7 +293,7 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
      * @return An Ipv4AddressNoZone object
      */
     public final @NonNull A4NZ ipv4AddressNoZoneFor(final int bits) {
-        return address4NoZoneFactory.newInstance(addressString(bits));
+        return address4NoZoneFactory.newInstance(Ipv4Utils.addressString(bits));
     }
 
     public final @NonNull A4 ipv4AddressFrom(final @NonNull P4 prefix) {
@@ -311,13 +311,13 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
          */
         final String str = ipv4AddressString(addr);
         final int percent = str.indexOf('%');
-        return ipv4StringBytes(str, percent == -1 ? str.length() : percent);
+        return Ipv4Utils.addressBytes(str, percent == -1 ? str.length() : percent);
     }
 
     public final int ipv4AddressBits(final @NonNull A4 addr) {
         final String str = ipv4AddressString(addr);
         final int percent = str.indexOf('%');
-        return ipv4StringBits(str, percent == -1 ? str.length() : percent);
+        return Ipv4Utils.addressBits(str, percent == -1 ? str.length() : percent);
     }
 
     public final byte @NonNull[] ipv4AddressNoZoneBytes(final @NonNull A4NZ addr) {
@@ -326,34 +326,12 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
          * the Ipv4AddressNoZone pattern, which must not include a zone index.
          */
         final String str = ipv4AddressString(addr);
-        return ipv4StringBytes(str, str.length());
+        return Ipv4Utils.addressBytes(str, str.length());
     }
 
     public final int ipv4AddressNoZoneBits(final @NonNull A4NZ addr) {
         final String str = ipv4AddressString(addr);
-        return ipv4StringBits(str, str.length());
-    }
-
-    private static byte @NonNull[] ipv4StringBytes(final String str, final int limit) {
-        final byte[] bytes = new byte[INET4_LENGTH];
-        Ipv4Utils.fillIpv4Bytes(bytes, 0, str, 0, limit);
-        return bytes;
-    }
-
-    private static int ipv4StringBits(final String str, final int limit) {
-        int prev = 0;
-        int current = 0;
-        for (int i = 0, shift = 24; i < limit; ++i) {
-            final char c = str.charAt(i);
-            if (c == '.') {
-                prev |= current << shift;
-                shift -= 8;
-                current = 0;
-            } else {
-                current = 10 * current + c - '0';
-            }
-        }
-        return prev | current;
+        return Ipv4Utils.addressBits(str, str.length());
     }
 
     /**
@@ -695,15 +673,6 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         }
     }
 
-    private static String addressString(final int bits) {
-        return new StringBuilder(15)
-                .append(bits >>> 24).append('.')
-                .append(bits >>> 16 & 0xFF).append('.')
-                .append(bits >>> 8 & 0xFF).append('.')
-                .append(bits & 0xFF)
-                .toString();
-    }
-
     static String addressStringV4(final byte @NonNull[] bytes) {
         final StringBuilder sb = new StringBuilder(15);
         appendIpv4String(sb, bytes);

diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtil.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtil.java
index 86fa3a4efe745683e59844d46ed0974b5cfe93b1..db1d25893a95f697eea0f6ba9687c70addd75f17 100644 (file)
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtil.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtil.java
@@ -141,11 +141,18 @@ public abstract class AbstractIetfYangUtil<M, P, H, Q, U> {
         return quadFactory.newInstance(AbstractIetfInetUtil.addressStringV4(bytes));
     }
 
-    public final byte @NonNull[] dottedQuadBytes(final @NonNull Q hexString) {
-        final String str = getQuadValue(hexString);
-        final byte[] bytes = new byte[4];
-        Ipv4Utils.fillIpv4Bytes(bytes, 0, str, 0, str.length());
-        return bytes;
+    public final @NonNull Q dottedQuadFor(final int bits) {
+        return quadFactory.newInstance(Ipv4Utils.addressString(bits));
+    }
+
+    public final int dottedQuadBits(final @NonNull Q dottedQuad) {
+        final String str = getQuadValue(dottedQuad);
+        return Ipv4Utils.addressBits(str, str.length());
+    }
+
+    public final byte @NonNull[] dottedQuadBytes(final @NonNull Q dottedQuad) {
+        final String str = getQuadValue(dottedQuad);
+        return Ipv4Utils.addressBytes(str, str.length());
     }
 
     public final @NonNull U uuidFor(final @NonNull UUID uuid) {

diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv4Utils.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv4Utils.java
index b79e2866810c2f813db0e873caa92db322e4cd1a..66a94ee09e658f49a0bed6eaad780f1e0c74d421 100644 (file)
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv4Utils.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv4Utils.java
@@ -35,4 +35,35 @@ final class Ipv4Utils {
 
         bytes[out] = (byte) val;
     }
+
+    static int addressBits(final String str, final int limit) {
+        int prev = 0;
+        int current = 0;
+        for (int i = 0, shift = 24; i < limit; ++i) {
+            final char c = str.charAt(i);
+            if (c == '.') {
+                prev |= current << shift;
+                shift -= 8;
+                current = 0;
+            } else {
+                current = 10 * current + c - '0';
+            }
+        }
+        return prev | current;
+    }
+
+    static byte @NonNull[] addressBytes(final String str, final int limit) {
+        final byte[] bytes = new byte[4];
+        Ipv4Utils.fillIpv4Bytes(bytes, 0, str, 0, limit);
+        return bytes;
+    }
+
+    static String addressString(final int bits) {
+        return new StringBuilder(15)
+                .append(bits >>> 24).append('.')
+                .append(bits >>> 16 & 0xFF).append('.')
+                .append(bits >>> 8 & 0xFF).append('.')
+                .append(bits & 0xFF)
+                .toString();
+    }
 }

diff --git a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtilTest.java b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtilTest.java
index 2b44c9d040422f246acf10ecb68af4d6878f5631..e45c19f2c24308067d1e3a81944b24fa71904b9b 100644 (file)
--- a/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtilTest.java
+++ b/model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfYangUtilTest.java
@@ -62,13 +62,25 @@ public class AbstractIetfYangUtilTest {
         assertArrayEquals(new byte[] { (byte) 0xaa, (byte) 0xbb }, UTIL.physAddressBytes(new PhysClass("aa:bb")));
     }
 
+    @Test
+    public void testQuadBits() {
+        assertEquals(0x01020304, UTIL.dottedQuadBits(new QuadClass("1.2.3.4")));
+        assertEquals(0xFFFFFFFF, UTIL.dottedQuadBits(new QuadClass("255.255.255.255")));
+    }
+
     @Test
     public void testQuadBytes() {
         assertArrayEquals(new byte[] { 1, 2, 3, 4 }, UTIL.dottedQuadBytes(new QuadClass("1.2.3.4")));
     }
 
     @Test
-    public void testQuadFor() {
+    public void testQuadForBits() {
+        assertEquals("1.2.3.4", UTIL.dottedQuadFor(0x01020304).getValue());
+        assertEquals("255.255.255.255", UTIL.dottedQuadFor(0xFFFFFFFF).getValue());
+    }
+
+    @Test
+    public void testQuadForBytes() {
         assertEquals("1.2.3.4", UTIL.dottedQuadFor(new byte[] { 1, 2, 3, 4 }).getValue());
     }