From 2ee3297342dfc9893b4a8ab815e1013eec3d30ac Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 6 Jan 2020 23:17:05 +0100 Subject: [PATCH] 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 (cherry picked from commit 4e1311cbb83dd15f2da7936385dd9384b6dc0229) --- .../model/ietf/util/AbstractIetfInetUtil.java | 43 +++---------------- .../model/ietf/util/AbstractIetfYangUtil.java | 17 +++++--- .../mdsal/model/ietf/util/Ipv4Utils.java | 31 +++++++++++++ .../ietf/util/AbstractIetfYangUtilTest.java | 14 +++++- 4 files changed, 62 insertions(+), 43 deletions(-) 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 88da958305..87c5beb893 100644 --- 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>> 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 86fa3a4efe..db1d25893a 100644 --- 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 { 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 b79e286681..66a94ee09e 100644 --- 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 2b44c9d040..e45c19f2c2 100644 --- 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()); } -- 2.36.6