From 957461dcfd741fc3290e4317c2297c5618b593b5 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Mon, 10 Oct 2016 15:37:04 +0200 Subject: HONEYCOMB-249 Add External IP pool management Change-Id: I3e57b09733b8c7060445ed1af7a5edb3348dd4e1 Signed-off-by: Maros Marsalek --- .../honeycomb/translate/vpp/util/Ipv4AddressRange.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'vpp-common') diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRange.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRange.java index 8408e79f4..7528c5464 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRange.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/honeycomb/translate/vpp/util/Ipv4AddressRange.java @@ -20,16 +20,22 @@ import java.util.Objects; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * IPv4 address range representation. */ public final class Ipv4AddressRange { + private static final Logger LOG = LoggerFactory.getLogger(Ipv4AddressRange.class); + private final Ipv4AddressNoZone start; private final Ipv4AddressNoZone end; - private Ipv4AddressRange(@Nonnull final Ipv4AddressNoZone start, @Nonnull final Ipv4AddressNoZone end) { + private Ipv4AddressRange( + @Nonnull final Ipv4AddressNoZone start, + @Nonnull final Ipv4AddressNoZone end) { this.start = start; this.end = end; } @@ -71,9 +77,9 @@ public final class Ipv4AddressRange { /** * Create address range from prefix. */ - public static Ipv4AddressRange fromPrefix(final Ipv4Prefix externalIpPool) { - final String addressString = externalIpPool.getValue().split("/")[0]; - byte prefixLength = Ipv4Translator.INSTANCE.extractPrefix(externalIpPool); + public static Ipv4AddressRange fromPrefix(@Nonnull final Ipv4Prefix prefix) { + final String addressString = prefix.getValue().split("/")[0]; + byte prefixLength = Ipv4Translator.INSTANCE.extractPrefix(prefix); if (prefixLength == 32) { // 32 Prefix can be handled instantly @@ -108,7 +114,8 @@ public final class Ipv4AddressRange { prefixAddrBytesF[i] = (byte) 255; } - return new Ipv4AddressRange(Ipv4Translator.INSTANCE.arrayToIpv4AddressNoZoneReversed(prefixAddrBytes0), + return new Ipv4AddressRange( + Ipv4Translator.INSTANCE.arrayToIpv4AddressNoZoneReversed(prefixAddrBytes0), Ipv4Translator.INSTANCE.arrayToIpv4AddressNoZoneReversed(prefixAddrBytesF)); } } -- cgit 1.2.3-korg