summaryrefslogtreecommitdiffstats
path: root/vpp-common
diff options
context:
space:
mode:
authorMichal Cmarada <michal.cmarada@pantheon.tech>2018-05-31 09:34:43 +0200
committerMichal Cmarada <michal.cmarada@pantheon.tech>2018-05-31 09:40:56 +0200
commita626d4ad0333762de57eb3298b9c7b3f9f19f82e (patch)
tree496d56862000e8a3803fad6f216b8f1a64ce1802 /vpp-common
parentbedf02b7e70a58ecbff98f261df816de3cf1e0a3 (diff)
Update AddressTranslator
- added handling of IpPrefixe - added UnitTests for the whole class Change-Id: I9fbdcce1ca8734b7415c55559ef65e553e737e44 Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
Diffstat (limited to 'vpp-common')
-rw-r--r--vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java25
-rw-r--r--vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/AddressTranslatorTest.java70
2 files changed, 94 insertions, 1 deletions
diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java
index b602dc569..c2f9deecb 100644
--- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java
+++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Arrays;
import javax.annotation.Nonnull;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
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.Ipv6Address;
@@ -35,7 +36,7 @@ public interface AddressTranslator extends Ipv4Translator, Ipv6Translator, MacTr
};
default byte[] ipAddressToArray(IpAddress address) {
- checkNotNull(address, "Cannot resolve null adddress");
+ checkNotNull(address, "Cannot resolve null address");
if (isIpv6(address)) {
return ipv6AddressNoZoneToArray(new Ipv6AddressNoZone(address.getIpv6Address()));
@@ -75,4 +76,26 @@ public interface AddressTranslator extends Ipv4Translator, Ipv6Translator, MacTr
default boolean addressesEqual(final IpAddress left, final IpAddress right) {
return Arrays.equals(left.getValue(), right.getValue());
}
+
+ /**
+ * Extract mask length from prefixed address
+ */
+ default byte extractPrefix(IpPrefix ipPrefix) {
+ if (isIpv6(ipPrefix)) {
+ return extractPrefix(ipPrefix.getIpv6Prefix());
+ } else {
+ return extractPrefix(ipPrefix.getIpv4Prefix());
+ }
+ }
+
+ /**
+ * Convert address part of prefix to byte array
+ */
+ default byte[] ipPrefixToArray(IpPrefix ipPrefix) {
+ if (isIpv6(ipPrefix)) {
+ return ipv6AddressPrefixToArray(ipPrefix.getIpv6Prefix());
+ } else {
+ return ipv4AddressPrefixToArray(ipPrefix.getIpv4Prefix());
+ }
+ }
}
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/AddressTranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/AddressTranslatorTest.java
new file mode 100644
index 000000000..ba850af89
--- /dev/null
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/hc2vpp/common/translate/util/AddressTranslatorTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2018 Bell Canada, Pantheon Technologies and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.common.translate.util;
+
+import java.util.Arrays;
+import org.junit.Assert;
+import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
+
+public class AddressTranslatorTest {
+
+ private final static IpAddress IPV6_ADDR = new IpAddress(new Ipv6Address("a::"));
+ private final static IpPrefix IPV6_PREFIX = new IpPrefix(new Ipv6Prefix("a::/48"));
+ private final static byte IPV6_BYTE_PREFIX = 48;
+ private final static IpAddress IPV4_ADDR = new IpAddress(new Ipv4Address("10.0.0.1"));
+ private final static IpPrefix IPV4_PREFIX = new IpPrefix(new Ipv4Prefix("10.0.0.1/24"));
+ private final static byte IPV4_BYTE_PREFIX = 24;
+ private static final byte[] IPV6_BYTE_ARRAY =
+ {(byte) 0, (byte) 10, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0,
+ (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0};
+ private static final byte[] IPV4_BYTE_ARRAY = {(byte) 10, (byte) 0, (byte) 0, (byte) 1};
+ private static final AddressTranslator ADDR_TRANSLATOR = new AddressTranslator() {};
+
+ @Test
+ public void ipAddressToArrayTest() {
+ Assert.assertTrue(Arrays.equals(IPV6_BYTE_ARRAY, ADDR_TRANSLATOR.ipAddressToArray(IPV6_ADDR)));
+ Assert.assertTrue(Arrays.equals(IPV6_BYTE_ARRAY, ADDR_TRANSLATOR.ipAddressToArray(true, IPV6_ADDR)));
+ Assert.assertTrue(Arrays.equals(IPV4_BYTE_ARRAY, ADDR_TRANSLATOR.ipAddressToArray(IPV4_ADDR)));
+ Assert.assertTrue(Arrays.equals(IPV4_BYTE_ARRAY, ADDR_TRANSLATOR.ipAddressToArray(false, IPV4_ADDR)));
+ }
+
+ @Test
+ public void arrayToIpAddressTest() {
+ Assert.assertTrue(
+ ADDR_TRANSLATOR.addressesEqual(IPV6_ADDR, ADDR_TRANSLATOR.arrayToIpAddress(true, IPV6_BYTE_ARRAY)));
+ Assert.assertTrue(
+ ADDR_TRANSLATOR.addressesEqual(IPV4_ADDR, ADDR_TRANSLATOR.arrayToIpAddress(false, IPV4_BYTE_ARRAY)));
+ }
+
+ @Test
+ public void extractPrefixTest() {
+ Assert.assertEquals(IPV6_BYTE_PREFIX, ADDR_TRANSLATOR.extractPrefix(IPV6_PREFIX));
+ Assert.assertEquals(IPV4_BYTE_PREFIX, ADDR_TRANSLATOR.extractPrefix(IPV4_PREFIX));
+ }
+
+ @Test
+ public void ipPrefixToArrayTest() {
+ Assert.assertTrue(Arrays.equals(IPV6_BYTE_ARRAY, ADDR_TRANSLATOR.ipPrefixToArray(IPV6_PREFIX)));
+ Assert.assertTrue(Arrays.equals(IPV4_BYTE_ARRAY, ADDR_TRANSLATOR.ipPrefixToArray(IPV4_PREFIX)));
+ }
+}