Migrate from legacy IetfInetUtils methods

Plain migration towards new types.

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

diff --git a/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java b/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
index 9672f1b276e0e80306ffd20a606e903e51665540..30aeb186a07a640613d1453a0195b83fb31579df 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/Ipv4Util.java
@@ -47,7 +47,7 @@ public final class Ipv4Util {
      * @return Ipv4AddressNoZone
      */
     public static Ipv4AddressNoZone addressForByteBuf(final ByteBuf buffer) {
-        return IetfInetUtil.INSTANCE.ipv4AddressNoZoneFor(ByteArray.readBytes(buffer, IP4_LENGTH));
+        return IetfInetUtil.INSTANCE.ipv4AddressFor(ByteArray.readBytes(buffer, IP4_LENGTH));
     }
 
     /**
@@ -227,8 +227,7 @@ public final class Ipv4Util {
     }
 
     public static Ipv4Prefix incrementIpv4Prefix(final Ipv4Prefix ipv4Prefix) {
-        final Entry<Ipv4AddressNoZone, Integer> splitIpv4Prefix =
-                IetfInetUtil.INSTANCE.splitIpv4PrefixNoZone(ipv4Prefix);
+        final Entry<Ipv4AddressNoZone, Integer> splitIpv4Prefix = IetfInetUtil.INSTANCE.splitIpv4Prefix(ipv4Prefix);
         return IetfInetUtil.INSTANCE.ipv4PrefixFor(incrementIpv4Address(splitIpv4Prefix.getKey()),
                 splitIpv4Prefix.getValue());
     }

diff --git a/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java b/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
index 29b9d1cd52810f9e25e7231962ee74f6a00ee4e8..3da2cab4e078f9ad516459f4b7ec3e2038189673 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/Ipv6Util.java
@@ -52,7 +52,7 @@ public final class Ipv6Util {
      * @return Ipv6Address
      */
     public static Ipv6AddressNoZone addressForByteBuf(final ByteBuf buffer) {
-        return IetfInetUtil.INSTANCE.ipv6AddressNoZoneFor(ByteArray.readBytes(buffer, IPV6_LENGTH));
+        return IetfInetUtil.INSTANCE.ipv6AddressFor(ByteArray.readBytes(buffer, IPV6_LENGTH));
     }
 
     /**