-/**
+/*
* Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
*/
package org.opendaylight.lispflowmapping.lisp.util;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
+import com.google.common.net.InetAddresses;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.List;
-
import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
+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;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.AsNumberAfi;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.DistinguishedNameAfi;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.DistinguishedNameType;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.ServicePathIdType;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.ServicePathLcaf;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SourceDestKeyLcaf;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.DistinguishedName;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPath;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4PrefixBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6PrefixBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Mac;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.MacBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.service.path.ServicePath;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKey;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKeyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv6AddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv4BinaryAfi;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv6BinaryAfi;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv6PrefixBinaryAfi;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4Binary;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
- .address.Ipv4BinaryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
- .address.Ipv4PrefixBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
- .address.Ipv4PrefixBinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4BinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4PrefixBinary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4PrefixBinaryBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6Binary;
-
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
- .address.Ipv6BinaryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
- .address.Ipv6PrefixBinary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
- .address.Ipv6PrefixBinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6BinaryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6PrefixBinary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv6PrefixBinaryBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.EidBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
-
-import com.google.common.net.InetAddresses;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
public class LispAddressUtilTest {
-
- private static final char[] DUMMY_CHARACTER_ARRAY_TEST = new char[]{'a', 'b', 'c', 'd'};
private static final Long NUMBER_TEST = 5L;
- private static final String MAC_ADDRESS_VALUE_TEST = "aa:bb:cc:dd:ee:ff";
- private static final MacAddress MAC_ADDRESS_TEST = new MacAddress("aa:bb:cc:dd:ee:ff");
-
private static final byte[] IPV4_ADDRESS_BYTES_A_TEST = new byte[]{(byte) 192, (byte) 168, 1, 1};
private static final byte[] IPV4_ADDRESS_BYTES_B_TEST = new byte[]{(byte) 192, (byte) 168, 1, 2};
private static final Long AS_NUMBER_TEST = 100L;
private static final Long INSTANCE_ID_TYPE_VALUE_TEST = 121L;
private static final Short INSTANCE_ID_TYPE_VALUE_SHORT_TEST = 122;
- private static final InstanceIdType INSTANCE_ID_TYPE_TEST = new InstanceIdType(INSTANCE_ID_TYPE_VALUE_TEST);
+ private static final InstanceIdType INSTANCE_ID_TYPE_TEST = new InstanceIdType(
+ fromJava(INSTANCE_ID_TYPE_VALUE_TEST));
private static final String INCORRECT_IP_ADDRESS_TEST = "incorrect ip address";
+ private static final String MAC_ADDRESS_VALUE_TEST = "aa:bb:cc:dd:ee:ff";
+ private static final MacAddress MAC_ADDRESS_TEST = new MacAddress(MAC_ADDRESS_VALUE_TEST);
+ private static final Mac MAC = new MacBuilder().setMac(MAC_ADDRESS_TEST).build();
+ private static final Eid MAC_ADDRESS_EID = new EidBuilder()
+ .setAddress(MAC)
+ .setAddressType(MacAfi.class)
+ .setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
+
private static final String IPV4_ADDRESS_VALUE_TEST = "192.168.1.1";
private static final String IPV4_ADDRESS_PREFIX_VALUE_TEST = IPV4_ADDRESS_VALUE_TEST + "/" + MASK_OK_TEST;
private static final Ipv4Address IPV4_ADDRESS_TEST = new Ipv4Address(IPV4_ADDRESS_VALUE_TEST);
+ private static final Ipv4 IPV4 = new Ipv4Builder().setIpv4(IPV4_ADDRESS_TEST).build();
private static final Ipv4AddressBinary IPV4_ADDRESS_BINARY_TEST = new Ipv4AddressBinary(IPV4_ADDRESS_BYTES_A_TEST);
private static final Ipv4Binary IPV4_BINARY = new Ipv4BinaryBuilder()
.setIpv4Binary(IPV4_ADDRESS_BINARY_TEST).build();
- private static final IpAddress IP_ADDRESS_OBJECT_WITH_IPV4_TEST = new IpAddress(IPV4_ADDRESS_TEST);
+ private static final IpAddress IP_ADDRESS_IPV4_TEST = new IpAddress(IPV4_ADDRESS_TEST);
private static final Ipv4Prefix IPV4_ADDRESS_PREFIX_TEST = new Ipv4Prefix(IPV4_ADDRESS_PREFIX_VALUE_TEST);
- private static final Ipv4PrefixBinary IPV4_ADDRESS_PREFIX_BINARY = new Ipv4PrefixBinaryBuilder()
+ private static final Ipv4PrefixBinary IPV4_ADDRESS_PREFIX_BINARY_1 = new Ipv4PrefixBinaryBuilder()
+ .setIpv4AddressBinary(new Ipv4AddressBinary(IPV4_ADDRESS_BYTES_A_TEST))
+ .setIpv4MaskLength(fromJava(MASK_OK_TEST)).build();
+ private static final Ipv4PrefixBinary IPV4_ADDRESS_PREFIX_BINARY_2 = new Ipv4PrefixBinaryBuilder()
.setIpv4AddressBinary(new Ipv4AddressBinary(IPV4_ADDRESS_BYTES_A_TEST))
- .setIpv4MaskLength(MASK_OK_TEST).build();
+ .setIpv4MaskLength(fromJava(MASK_OK_DEFAULT_IPV4_TEST)).build();
private static final IpPrefix IP_ADDRESS_PREFIX_WITH_IPV4_TEST = new IpPrefix(IPV4_ADDRESS_PREFIX_TEST);
- private static final Eid IPV4_ADDRESS_PREFIX_BINARY_EID = new EidBuilder()
- .setAddress(IPV4_ADDRESS_PREFIX_BINARY)
+ private static final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp
+ .address.address.Ipv4Prefix IPV4_PREFIX = new Ipv4PrefixBuilder()
+ .setIpv4Prefix(IPV4_ADDRESS_PREFIX_TEST).build();
+ private static final Eid IPV4_ADDRESS_PREFIX_BINARY_EID_1 = new EidBuilder()
+ .setAddress(IPV4_ADDRESS_PREFIX_BINARY_1)
+ .setAddressType(Ipv4PrefixBinaryAfi.class)
+ .setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
+ private static final Eid IPV4_ADDRESS_PREFIX_BINARY_EID_2 = new EidBuilder()
+ .setAddress(IPV4_ADDRESS_PREFIX_BINARY_2)
+ .setAddressType(Ipv4PrefixBinaryAfi.class)
+ .setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
+ private static final Eid IPV4_ADDRESS_BINARY_EID = new EidBuilder()
+ .setAddress(IPV4_BINARY)
+ .setAddressType(Ipv4BinaryAfi.class)
+ .setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
+ private static final Eid IPV4_EID = new EidBuilder()
+ .setAddress(IPV4)
+ .setAddressType(Ipv4Afi.class)
+ .setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
+ private static final Eid IPV4_PREFIX_EID = new EidBuilder()
+ .setAddress(IPV4_PREFIX)
+ .setAddressType(Ipv4PrefixAfi.class)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
+ private static final Rloc IPV4_RLOC = new RlocBuilder()
+ .setAddress(IPV4)
+ .setAddressType(Ipv4Afi.class).build();
+ private static final Rloc IPV4_BINARY_RLOC = new RlocBuilder()
+ .setAddress(IPV4_BINARY)
+ .setAddressType(Ipv4BinaryAfi.class).build();
private static final byte[] IPV6_ADDRESS_BYTES_A_TEST = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16};
+ 15, 16};
private static final byte[] IPV6_ADDRESS_BYTES_B_TEST = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 17};
+ 15, 17};
private static final String IPV6_ADDRESS_VALUE_TEST = "102:304:506:708:90a:b0c:d0e:f10";
private static final String IPV6_ADDRESS_PREFIX_VALUE_TEST = IPV6_ADDRESS_VALUE_TEST + "/" + MASK_OK_TEST;
private static final Ipv6Prefix IPV6_ADDRESS_PREFIX_TEST = new Ipv6Prefix(IPV6_ADDRESS_PREFIX_VALUE_TEST);
private static final Ipv6Address IPV6_ADDRESS_TEST = new Ipv6Address(IPV6_ADDRESS_VALUE_TEST);
+ private static final Ipv6 IPV6 = new Ipv6Builder().setIpv6(IPV6_ADDRESS_TEST).build();
private static final Ipv6AddressBinary IPV6_ADDRESS_BINARY_TEST = new Ipv6AddressBinary(IPV6_ADDRESS_BYTES_A_TEST);
private static final Ipv6Binary IPV6_BINARY = new Ipv6BinaryBuilder()
.setIpv6Binary(IPV6_ADDRESS_BINARY_TEST).build();
private static final IpPrefix IP_ADDRESS_PREFIX_WITH_IPV6_TEST = new IpPrefix(IPV6_ADDRESS_PREFIX_TEST);
- private static final IpAddress IP_ADDRESS_OBJECT_WITH_IPV6_TEST = new IpAddress(IPV6_ADDRESS_TEST);
- private static final Ipv6PrefixBinary IPV6_ADDRESS_PREFIX_BINARY = new Ipv6PrefixBinaryBuilder()
+ private static final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp
+ .address.address.Ipv6Prefix IPV6_PREFIX = new Ipv6PrefixBuilder()
+ .setIpv6Prefix(IPV6_ADDRESS_PREFIX_TEST).build();
+ private static final IpAddress IP_ADDRESS_IPV6_TEST = new IpAddress(IPV6_ADDRESS_TEST);
+ private static final Ipv6PrefixBinary IPV6_ADDRESS_PREFIX_BINARY_1 = new Ipv6PrefixBinaryBuilder()
.setIpv6AddressBinary(new Ipv6AddressBinary(IPV6_ADDRESS_BYTES_A_TEST))
- .setIpv6MaskLength(MASK_OK_TEST).build();
- private static final Eid IPV6_ADDRESS_PREFIX_BINARY_EID = new EidBuilder()
- .setAddress(IPV6_ADDRESS_PREFIX_BINARY)
+ .setIpv6MaskLength(fromJava(MASK_OK_TEST)).build();
+ private static final Ipv6PrefixBinary IPV6_ADDRESS_PREFIX_BINARY_2 = new Ipv6PrefixBinaryBuilder()
+ .setIpv6AddressBinary(new Ipv6AddressBinary(IPV6_ADDRESS_BYTES_A_TEST))
+ .setIpv6MaskLength(fromJava(MASK_OK_DEFAULT_IPV6_TEST)).build();
+ private static final Eid IPV6_ADDRESS_PREFIX_BINARY_EID_1 = new EidBuilder()
+ .setAddress(IPV6_ADDRESS_PREFIX_BINARY_1)
+ .setAddressType(Ipv6PrefixBinaryAfi.class)
+ .setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
+ private static final Eid IPV6_ADDRESS_PREFIX_BINARY_EID_2 = new EidBuilder()
+ .setAddress(IPV6_ADDRESS_PREFIX_BINARY_2)
+ .setAddressType(Ipv6PrefixBinaryAfi.class)
+ .setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
+ private static final Eid IPV6_ADDRESS_BINARY_EID = new EidBuilder()
+ .setAddress(IPV6_BINARY)
+ .setAddressType(Ipv6BinaryAfi.class)
+ .setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
+ private static final Eid IPV6_EID = new EidBuilder()
+ .setAddress(IPV6)
+ .setAddressType(Ipv6BinaryAfi.class)
.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST).build();
private static final Short SERVICE_INDEX_TEST = 45;
private static final Long DUMMY_SERVICE_PATH_ID_TYPE = 46L;
private static final String DISTINGUISHED_NAME_TYPE_VALUE_TEST = "dummy distinguished name type";
private static final String DISTINGUISHED_NAME_TYPE_VALUE_WITH_MAC_TEST = MAC_ADDRESS_VALUE_TEST;
- private static final DistinguishedNameType DISTINGUISHED_NAME_TYPE_TEST = new DistinguishedNameType
- (DISTINGUISHED_NAME_TYPE_VALUE_TEST);
-
- private static final SimpleAddress SIMPLE_ADDRESS_A_TEST = new SimpleAddress(IP_ADDRESS_OBJECT_WITH_IPV4_TEST);
- private static final SimpleAddress SIMPLE_ADDRESS_B_TEST = new SimpleAddress(MAC_ADDRESS_TEST);
- private static final String SIMPLE_ADDRESS_DISTINGUISHED_VALUE_TEST = DISTINGUISHED_NAME_TYPE_VALUE_TEST;
- private static final SimpleAddress SIMPLE_ADDRESS_DISTINGUISHED_TEST = new SimpleAddress(new DistinguishedNameType
- (SIMPLE_ADDRESS_DISTINGUISHED_VALUE_TEST));
- private static final SimpleAddress SIMPLE_ADDRESS_WITH_IP_PREFIX_IPV4_TEST = new SimpleAddress
- (IP_ADDRESS_PREFIX_WITH_IPV4_TEST);
- private static final SimpleAddress SIMPLE_ADDRESS_WITH_IP_PREFIX_IPV6_TEST = new SimpleAddress
- (IP_ADDRESS_PREFIX_WITH_IPV6_TEST);
+ private static final DistinguishedNameType DISTINGUISHED_NAME_TYPE_TEST = new DistinguishedNameType(
+ DISTINGUISHED_NAME_TYPE_VALUE_TEST);
+
+ private static final SimpleAddress SIMPLE_ADDRESS_IPV4_TEST = new SimpleAddress(IP_ADDRESS_IPV4_TEST);
+ private static final SimpleAddress SIMPLE_ADDRESS_IPV6_TEST = new SimpleAddress(IP_ADDRESS_IPV6_TEST);
+ private static final SimpleAddress SIMPLE_ADDRESS_MAC_TEST = new SimpleAddress(MAC_ADDRESS_TEST);
+ private static final SimpleAddress SIMPLE_ADDRESS_DISTINGUISHED_TEST =
+ new SimpleAddress(DISTINGUISHED_NAME_TYPE_TEST);
+ private static final SimpleAddress SIMPLE_ADDRESS_IPV4_PREFIX_TEST = new SimpleAddress(
+ IP_ADDRESS_PREFIX_WITH_IPV4_TEST);
+ private static final SimpleAddress SIMPLE_ADDRESS_IPV6_PREFIX_TEST = new SimpleAddress(
+ IP_ADDRESS_PREFIX_WITH_IPV6_TEST);
private static final Long SERVICE_PATH_ID_TEST = 2121L;
/**
* Tests {@link LispAddressUtil#addressTypeFromSimpleAddress} and {@link
* LispAddressUtil#addressFromSimpleAddress} methods
- * with ipAddress
+ * with ipAddress.
*/
@Test
public void addressFromSimpleAddressTest_asAnyIpAddress() {
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress
- (SIMPLE_ADDRESS_A_TEST);
+ final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
+ SIMPLE_ADDRESS_IPV4_TEST);
assertEquals(Ipv4BinaryAfi.class, addressClass);
- final Address address = LispAddressUtil.addressFromSimpleAddress(SIMPLE_ADDRESS_A_TEST);
+ final Address address = LispAddressUtil.addressFromSimpleAddress(SIMPLE_ADDRESS_IPV4_TEST);
assertTrue(address instanceof Ipv4Binary);
}
/**
* Tests {@link LispAddressUtil#addressTypeFromSimpleAddress} and {@link
* LispAddressUtil#addressFromSimpleAddress} methods
- * with ipPrefix
+ * with ipPrefix.
*/
@Test
public void addressFromSimpleAddressTest_asIpPrefix() {
final SimpleAddress simpleAddress = new SimpleAddress(new IpPrefix(new Ipv4Prefix(
IPV4_ADDRESS_PREFIX_VALUE_TEST)));
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress
- (simpleAddress);
+ final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
+ simpleAddress);
assertEquals(Ipv4PrefixAfi.class, addressClass);
final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
/**
* Tests {@link LispAddressUtil#addressTypeFromSimpleAddress} and {@link
* LispAddressUtil#addressFromSimpleAddress} methods
- * with mac address
+ * with mac address.
*/
@Test
public void addressFromSimpleAddressTest_asMacAddress() {
final SimpleAddress simpleAddress = new SimpleAddress(new MacAddress(MAC_ADDRESS_VALUE_TEST));
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress
- (simpleAddress);
+ final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
+ simpleAddress);
assertEquals(MacAfi.class, addressClass);
final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
/**
* Tests {@link LispAddressUtil#addressTypeFromSimpleAddress} and {@link
* LispAddressUtil#addressFromSimpleAddress} methods
- * with general address
+ * with general address.
*/
@Test
public void addressFromSimpleAddressTest_asAddress() {
- final SimpleAddress simpleAddress = new SimpleAddress(DUMMY_CHARACTER_ARRAY_TEST);
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress
- (simpleAddress);
+ final SimpleAddress simpleAddress = SimpleAddressBuilder.getDefaultInstance("abcd");
+ final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
+ simpleAddress);
assertEquals(DistinguishedNameAfi.class, addressClass);
final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
/**
* Tests {@link LispAddressUtil#addressTypeFromSimpleAddress} and {@link
* LispAddressUtil#addressFromSimpleAddress} methods
- * with address as number
+ * with address as number.
*/
@Test
public void addressFromSimpleAddressTest_asNumber() {
- final SimpleAddress simpleAddress = new SimpleAddress(new AsNumber(NUMBER_TEST));
- final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress
- (simpleAddress);
+ final SimpleAddress simpleAddress = new SimpleAddress(new AsNumber(fromJava(NUMBER_TEST)));
+ final Class<? extends LispAddressFamily> addressClass = LispAddressUtil.addressTypeFromSimpleAddress(
+ simpleAddress);
assertEquals(AsNumberAfi.class, addressClass);
final Address address = LispAddressUtil.addressFromSimpleAddress(simpleAddress);
/**
* Tests {@link LispAddressUtil#addressFromInet(InetAddress)} and {@link LispAddressUtil#addressTypeFromInet
* (InetAddress)}
- * methods with ipv4 address
- *
- * @throws UnknownHostException
+ * methods with ipv4 address.
*/
@Test
public void addressFromInet_ipv4() throws UnknownHostException {
/**
* Tests {@link LispAddressUtil#addressFromInet(InetAddress)} and {@link LispAddressUtil#addressTypeFromInet
* (InetAddress)}
- * methods with ipv6 address
- *
- * @throws UnknownHostException
+ * methods with ipv6 address.
*/
@Test
public void addressFromInet_ipv6() throws UnknownHostException {
assertEquals(IPV6_ADDRESS_VALUE_TEST, ((Ipv6) address).getIpv6().getValue());
}
+ /**
+ * Tests {@link LispAddressUtil#binaryAddressFromInet(InetAddress)} and
+ * {@link LispAddressUtil#binaryAddressTypeFromInet(InetAddress)} methods with ipv4 address.
+ */
+ @Test
+ public void binaryAddressFromInet_ipv4() throws UnknownHostException {
+ final InetAddress ipv4InetAddress = Inet4Address.getByAddress(IPV4_ADDRESS_BYTES_A_TEST);
+ Class<? extends LispAddressFamily> addressClass = LispAddressUtil.binaryAddressTypeFromInet(ipv4InetAddress);
+ assertEquals(Ipv4BinaryAfi.class, addressClass);
+
+ final Address address = LispAddressUtil.binaryAddressFromInet(ipv4InetAddress);
+ assertTrue(address instanceof Ipv4Binary);
+ assertArrayEquals(IPV4_ADDRESS_BYTES_A_TEST, ((Ipv4Binary) address).getIpv4Binary().getValue());
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#binaryAddressFromInet(InetAddress)} and
+ * {@link LispAddressUtil#binaryAddressTypeFromInet(InetAddress)} methods with ipv6 address.
+ */
+ @Test
+ public void binaryAddressFromInet_ipv6() throws UnknownHostException {
+ final InetAddress ipv6InetAddress = Inet6Address.getByAddress(IPV6_ADDRESS_BYTES_A_TEST);
+ Class<? extends LispAddressFamily> addressClass = LispAddressUtil.binaryAddressTypeFromInet(ipv6InetAddress);
+ assertEquals(Ipv6BinaryAfi.class, addressClass);
+
+ final Address address = LispAddressUtil.binaryAddressFromInet(ipv6InetAddress);
+ assertTrue(address instanceof Ipv6Binary);
+ assertArrayEquals(IPV6_ADDRESS_BYTES_A_TEST, ((Ipv6Binary) address).getIpv6Binary().getValue());
+ }
+
/**
* Tests {@link LispAddressUtil#addressFromIpAddress(IpAddress)} and {@link
* LispAddressUtil#addressTypeFromIpAddress(IpAddress)}
- * methods with ipv4 address
+ * methods with ipv4 address.
*/
@Test
public void addressFromIpAddress_ipv4() {
/**
* Tests {@link LispAddressUtil#addressFromIpAddress(IpAddress)} and {@link
* LispAddressUtil#addressTypeFromIpAddress(IpAddress)}
- * methods with ipv6 address
+ * methods with ipv6 address.
*/
@Test
public void addressFromIpAddress_ipv6() {
* LispAddressUtil#binaryAddressTypeFromIpAddress(IpAddress)}
* methods with Ipv6Binary address.
*/
- @Test(expected = NullPointerException.class)
+ @Test
public void binaryAddressFromIpAddress_Ipv6Binary() {
final IpAddress ipv6Address = new IpAddress(new Ipv6Address(IPV6_ADDRESS_VALUE_TEST));
final Class<? extends LispAddressFamily> addressClass = LispAddressUtil
/**
* Tests {@link LispAddressUtil#addressFromIpPrefix(IpPrefix)} and {@link
* LispAddressUtil#addressTypeFromIpPrefix(IpPrefix)}
- * methods with ipv4 address
+ * methods with ipv4 address.
*/
@Test
public void addressFromIpPrefix_ipv4() {
assertEquals(Ipv4PrefixAfi.class, addressClass);
final Address address = LispAddressUtil.addressFromIpPrefix(ipv4Prefix);
- assertTrue(address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.
- types.rev151105.lisp.address.address.Ipv4Prefix);
- assertEquals(IPV4_ADDRESS_PREFIX_VALUE_TEST, ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.
- lisp.address.types.rev151105.lisp.address.address.Ipv4Prefix) address).getIpv4Prefix().getValue());
+ assertTrue(address instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address
+ .types.rev151105.lisp.address.address.Ipv4Prefix);
+ assertEquals(IPV4_ADDRESS_PREFIX_VALUE_TEST, ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
+ .lisp.address.types.rev151105.lisp.address.address.Ipv4Prefix) address).getIpv4Prefix().getValue());
}
/**
* Tests {@link LispAddressUtil#addressFromIpPrefix(IpPrefix)} and {@link
* LispAddressUtil#addressTypeFromIpPrefix(IpPrefix)}
- * methods with ipv6 address
+ * methods with ipv6 address.
*/
@Test
public void addressFromIpPrefix_ipv6() {
/**
- * Test {@link LispAddressUtil#addressFromServicePath(ServicePath)} method with concrete servicePath
+ * Test {@link LispAddressUtil#addressFromServicePath(ServicePath)} method with concrete servicePath.
*/
@Test
public void addressFromServicePathTest_withServicePath() {
.address.service.path.ServicePathBuilder servicePathBuilder = new org.opendaylight.yang.gen.v1.urn.ietf
.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
.address.service.path.ServicePathBuilder();
- servicePathBuilder.setServiceIndex(SERVICE_INDEX_TEST);
- servicePathBuilder.setServicePathId(new ServicePathIdType(DUMMY_SERVICE_PATH_ID_TYPE));
+ servicePathBuilder.setServiceIndex(fromJava(SERVICE_INDEX_TEST));
+ servicePathBuilder.setServicePathId(new ServicePathIdType(fromJava(DUMMY_SERVICE_PATH_ID_TYPE)));
ServicePath expectedAddress = servicePathBuilder.build();
final Address testedAddress = LispAddressUtil.addressFromServicePath(expectedAddress);
}
/**
- * Test {@link LispAddressUtil#addressFromServicePath(ServicePath)} method with null value
+ * Test {@link LispAddressUtil#addressFromServicePath(ServicePath)} method with null value.
*/
@Test
public void addressFromServicePathTest_withNull() {
}
/**
- * Test {@link LispAddressUtil#addressFromDistinguishedName(DistinguishedNameType)} method with distinguished name }
+ * Test {@link LispAddressUtil#addressFromDistinguishedName(DistinguishedNameType)} method with distinguished name.
*/
@Test
public void addressFromDistinguishedNameTest_withDistinguishedName() {
}
/**
- * Test {@link LispAddressUtil#addressFromDistinguishedName(DistinguishedNameType)} method with null value }
+ * Test {@link LispAddressUtil#addressFromDistinguishedName(DistinguishedNameType)} method with null value.
*/
@Test
public void addressFromDistinguishedNameTest_withNull() {
}
/**
- * Test {@link LispAddressUtil#addressFromAsNumber(AsNumber)} method with as number value }
+ * Test {@link LispAddressUtil#addressFromAsNumber(AsNumber)} method with as number value.
*/
@Test
public void addressFromAsNumberTest_withAdNumber() {
- final AsNumber expectedAddress = new AsNumber(AS_NUMBER_TEST);
+ final AsNumber expectedAddress = new AsNumber(fromJava(AS_NUMBER_TEST));
final Address testedAddress = LispAddressUtil.addressFromAsNumber(expectedAddress);
assertTrue(testedAddress instanceof org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp
.address.types.rev151105.lisp.address.address.AsNumber);
}
/**
- * Test {@link LispAddressUtil#addressFromAsNumber(AsNumber)} method with null instead of value }
+ * Test {@link LispAddressUtil#addressFromAsNumber(AsNumber)} method with null instead of value.
*/
@Test
public void addressFromAsNumberTest_withNull() {
public void toRloc() throws UnknownHostException {
InetAddress ipv4AddressInet = Inet4Address.getByAddress(IPV4_ADDRESS_BYTES_A_TEST);
final Rloc rlocFromInetAddress = LispAddressUtil.toRloc(ipv4AddressInet);
- assertEquals(Ipv4Afi.class, rlocFromInetAddress.getAddressType());
- assertEquals(IPV4_ADDRESS_VALUE_TEST, ((Ipv4)rlocFromInetAddress.getAddress()).getIpv4().getValue());
+ assertEquals(Ipv4BinaryAfi.class, rlocFromInetAddress.getAddressType());
+ assertEquals(IPV4_ADDRESS_BINARY_TEST, ((Ipv4Binary) rlocFromInetAddress.getAddress()).getIpv4Binary());
final Rloc rlocFromIpv4Address = LispAddressUtil.toRloc(IPV4_ADDRESS_TEST);
assertEquals(Ipv4Afi.class, rlocFromIpv4Address.getAddressType());
assertEquals(Ipv6Afi.class, rlocFromIpv6Address.getAddressType());
assertEquals(IPV6_ADDRESS_VALUE_TEST, ((Ipv6) rlocFromIpv6Address.getAddress()).getIpv6().getValue());
- final Rloc rlocFromSimpleAddress = LispAddressUtil.toRloc(SIMPLE_ADDRESS_A_TEST);
+ final Rloc rlocFromSimpleAddress = LispAddressUtil.toRloc(SIMPLE_ADDRESS_IPV4_TEST);
assertEquals(Ipv4BinaryAfi.class, rlocFromSimpleAddress.getAddressType());
assertEquals(IPV4_ADDRESS_BINARY_TEST, ((Ipv4Binary) rlocFromSimpleAddress.getAddress()).getIpv4Binary());
}
*/
@Test
public void toEid_ipv6Prefix() throws UnknownHostException {
+ final Inet6Address inet6Address = (Inet6Address) Inet6Address.getByName(IPV6_ADDRESS_VALUE_TEST);
+
Eid eidFromIpv6Prefix = LispAddressUtil.toEid(IPV6_ADDRESS_PREFIX_TEST, INSTANCE_ID_TYPE_TEST);
verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, true, MASK_OK_TEST, Ipv6PrefixAfi.class);
eidFromIpv6Prefix = LispAddressUtil.asIpv6PrefixEid(IPV6_ADDRESS_PREFIX_VALUE_TEST);
verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, false, MASK_OK_TEST, Ipv6PrefixAfi.class);
- eidFromIpv6Prefix = LispAddressUtil.asIpv6PrefixEid(IPV6_ADDRESS_TEST, INSTANCE_ID_TYPE_TEST);
+ eidFromIpv6Prefix = LispAddressUtil.asIpv6PrefixEid(IPV6_ADDRESS_PREFIX_BINARY_EID_1, inet6Address,
+ MASK_OK_DEFAULT_IPV6_TEST);
verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, true, MASK_OK_DEFAULT_IPV6_TEST, Ipv6PrefixAfi.class);
+ eidFromIpv6Prefix = LispAddressUtil.asIpv6PrefixEid(IPV6_ADDRESS_TEST, INSTANCE_ID_TYPE_TEST);
+ verifyToEidWithIpv6Prefix(eidFromIpv6Prefix, true, MASK_OK_DEFAULT_IPV6_TEST, Ipv6PrefixAfi.class);
}
/**
*/
@Test
public void toEid_ipv4Prefix() throws UnknownHostException {
+ final Inet4Address inet4Address = (Inet4Address) Inet4Address.getByName(IPV4_ADDRESS_VALUE_TEST);
+
Eid eidFromIpv4Prefix = LispAddressUtil.toEid(IPV4_ADDRESS_PREFIX_TEST, INSTANCE_ID_TYPE_TEST);
verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, true, MASK_OK_TEST, Ipv4PrefixAfi.class);
eidFromIpv4Prefix = LispAddressUtil.asIpv4PrefixEid(IPV4_ADDRESS_PREFIX_VALUE_TEST);
verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, false, MASK_OK_TEST, Ipv4PrefixAfi.class);
- eidFromIpv4Prefix = LispAddressUtil.asIpv4PrefixEid(IPV4_ADDRESS_TEST, INSTANCE_ID_TYPE_TEST);
+ eidFromIpv4Prefix = LispAddressUtil.asIpv4PrefixEid(IPV4_ADDRESS_PREFIX_BINARY_EID_1, inet4Address,
+ MASK_OK_DEFAULT_IPV4_TEST);
+ verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, true, MASK_OK_DEFAULT_IPV4_TEST, Ipv4PrefixAfi.class);
+
+ eidFromIpv4Prefix = LispAddressUtil.asIpv4PrefixEid(IPV4_ADDRESS_TEST, INSTANCE_ID_TYPE_TEST);
+ verifyToEidWithIpv4Prefix(eidFromIpv4Prefix, true, MASK_OK_DEFAULT_IPV4_TEST, Ipv4PrefixAfi.class);
}
/**
*/
@Test
public void toEid_ipv4PrefixBinary() {
- Eid eidFromIpv4PrefixBinary = LispAddressUtil.toEid(IPV4_ADDRESS_PREFIX_BINARY, INSTANCE_ID_TYPE_TEST);
+ Eid eidFromIpv4PrefixBinary = LispAddressUtil.toEid(IPV4_ADDRESS_PREFIX_BINARY_1, INSTANCE_ID_TYPE_TEST);
verifyToEidWithIpv4PrefixBinary(eidFromIpv4PrefixBinary, true, MASK_OK_TEST, Ipv4PrefixBinaryAfi.class);
eidFromIpv4PrefixBinary = LispAddressUtil.asIpv4PrefixBinaryEid(IPV4_ADDRESS_PREFIX_VALUE_TEST);
INSTANCE_ID_TYPE_TEST);
verifyToEidWithIpv4PrefixBinary(eidFromIpv4PrefixBinary, true, MASK_OK_TEST, Ipv4PrefixBinaryAfi.class);
- eidFromIpv4PrefixBinary = LispAddressUtil.asIpv4PrefixBinaryEid(IPV4_ADDRESS_PREFIX_BINARY_EID,
+ eidFromIpv4PrefixBinary = LispAddressUtil.asIpv4PrefixBinaryEid(IPV4_ADDRESS_PREFIX_BINARY_EID_1,
IPV4_ADDRESS_BYTES_A_TEST, MASK_OK_TEST);
verifyToEidWithIpv4PrefixBinary(eidFromIpv4PrefixBinary, true, MASK_OK_TEST, Ipv4PrefixBinaryAfi.class);
}
*/
@Test
public void toEid_ipv6PrefixBinary() {
- Eid eidFromIpv6PrefixBinary = LispAddressUtil.toEid(IPV6_ADDRESS_PREFIX_BINARY, INSTANCE_ID_TYPE_TEST);
+ Eid eidFromIpv6PrefixBinary = LispAddressUtil.toEid(IPV6_ADDRESS_PREFIX_BINARY_1, INSTANCE_ID_TYPE_TEST);
verifyToEidWithIpv6PrefixBinary(eidFromIpv6PrefixBinary, true, MASK_OK_TEST, Ipv6PrefixBinaryAfi.class);
eidFromIpv6PrefixBinary = LispAddressUtil.asIpv6PrefixBinaryEid(IPV6_ADDRESS_PREFIX_VALUE_TEST);
INSTANCE_ID_TYPE_TEST);
verifyToEidWithIpv6PrefixBinary(eidFromIpv6PrefixBinary, true, MASK_OK_TEST, Ipv6PrefixBinaryAfi.class);
- eidFromIpv6PrefixBinary = LispAddressUtil.asIpv6PrefixBinaryEid(IPV6_ADDRESS_PREFIX_BINARY_EID,
+ eidFromIpv6PrefixBinary = LispAddressUtil.asIpv6PrefixBinaryEid(IPV6_ADDRESS_PREFIX_BINARY_EID_1,
IPV6_ADDRESS_BYTES_A_TEST, MASK_OK_TEST);
verifyToEidWithIpv6PrefixBinary(eidFromIpv6PrefixBinary, true, MASK_OK_TEST, Ipv6PrefixBinaryAfi.class);
}
- public Eid provideDummyMacEid() {
- final EidBuilder eidBuilder = new EidBuilder();
- eidBuilder.setAddressType(MacAfi.class);
- eidBuilder.setVirtualNetworkId(INSTANCE_ID_TYPE_TEST);
- return eidBuilder.build();
- }
-
/**
* Test
* - {@link LispAddressUtil#toEid(Ipv4Address, InstanceIdType)}
eidFromDistinguishedName = LispAddressUtil.asDistinguishedNameEid(DISTINGUISHED_NAME_TYPE_VALUE_TEST);
verifyToEidWithDistinguishedName(eidFromDistinguishedName, false);
- eidFromDistinguishedName = LispAddressUtil.asDistinguishedNameEid
- (DISTINGUISHED_NAME_TYPE_VALUE_WITH_MAC_TEST, INSTANCE_ID_TYPE_VALUE_TEST);
+ eidFromDistinguishedName = LispAddressUtil.asDistinguishedNameEid(
+ DISTINGUISHED_NAME_TYPE_VALUE_WITH_MAC_TEST, INSTANCE_ID_TYPE_VALUE_TEST);
verifyToEidWithMacAddress(eidFromDistinguishedName, true);
}
assertArrayEquals(IPV6_ADDRESS_BYTES_A_TEST, ((Ipv6PrefixBinary) eidFromIpv6PrefixBinary
.getAddress()).getIpv6AddressBinary().getValue());
assertEquals(expectedMask,
- (short) ((Ipv6PrefixBinary) eidFromIpv6PrefixBinary.getAddress()).getIpv6MaskLength());
+ (short) ((Ipv6PrefixBinary) eidFromIpv6PrefixBinary.getAddress()).getIpv6MaskLength().toJava());
}
private void verifyToEidWithIpv4(final Eid eidFromIpv4, final boolean isVniChecked) {
assertEquals(IPV4_ADDRESS_VALUE_TEST, ((Ipv4) eidFromIpv4.getAddress()).getIpv4().getValue());
}
+ private void verifyToRlocWithIpv4(final Rloc rlocFromIpv4, final boolean isVniChecked) {
+ assertEquals(Ipv4Afi.class, rlocFromIpv4.getAddressType());
+ if (isVniChecked) {
+ assertEquals(INSTANCE_ID_TYPE_TEST, rlocFromIpv4.getVirtualNetworkId());
+ }
+ assertEquals(IPV4_ADDRESS_VALUE_TEST, ((Ipv4) rlocFromIpv4.getAddress()).getIpv4().getValue());
+ }
+
private void verifyToEidWithIpv4Binary(final Eid eidFromIpv4, final boolean isVniChecked) {
assertEquals(Ipv4BinaryAfi.class, eidFromIpv4.getAddressType());
if (isVniChecked) {
((Ipv4Binary) eidFromIpv4.getAddress()).getIpv4Binary().getValue());
}
+ private void verifyToRlocWithIpv4Binary(final Rloc rlocFromIpv4, final boolean isVniChecked) {
+ assertEquals(Ipv4BinaryAfi.class, rlocFromIpv4.getAddressType());
+ if (isVniChecked) {
+ assertEquals(INSTANCE_ID_TYPE_TEST, rlocFromIpv4.getVirtualNetworkId());
+ }
+ assertArrayEquals(IPV4_ADDRESS_BYTES_A_TEST,
+ ((Ipv4Binary) rlocFromIpv4.getAddress()).getIpv4Binary().getValue());
+ }
+
private void verifyToEidWithIpv6(final Eid eidFromIpv6, final boolean isVniChecked) {
assertEquals(Ipv6Afi.class, eidFromIpv6.getAddressType());
if (isVniChecked) {
assertArrayEquals(IPV4_ADDRESS_BYTES_A_TEST,
((Ipv4PrefixBinary) eidFromIpv4PrefixBinary.getAddress()).getIpv4AddressBinary().getValue());
assertEquals(expectedMask,
- (short) ((Ipv4PrefixBinary) eidFromIpv4PrefixBinary.getAddress()).getIpv4MaskLength());
+ (short) ((Ipv4PrefixBinary) eidFromIpv4PrefixBinary.getAddress()).getIpv4MaskLength().toJava());
}
private void verifyToEidWithIpv6Binary(final Eid eidFromIpv6, final boolean isVniChecked) {
}
/**
- * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with ipv4 address and correct mask
+ * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with ipv4 address and correct mask.
*/
@Test
public void asIpPrefix_ipv4() {
}
/**
- * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with ipv6 address and correct mask
+ * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with ipv6 address and correct mask.
*/
@Test
public void asIpPrefix_ipv6() {
}
/**
- * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with incorrect ip address and correct mask
+ * Tests {@link LispAddressUtil#asIpPrefix(String, int)} with incorrect ip address and correct mask.
*/
@Test
public void asIpPrefix_other() {
}
/**
- * Tests {@link LispAddressUtil#ipVersionFromString(String)} with ipv4
+ * Tests {@link LispAddressUtil#asBinaryEid(SimpleAddress, InstanceIdType)} method with ipv4Prefix.
+ */
+ @Test
+ public void asBinaryEidTest_ipv4Prefix() {
+ final Eid result = LispAddressUtil.asBinaryEid(SIMPLE_ADDRESS_IPV4_PREFIX_TEST, INSTANCE_ID_TYPE_TEST);
+ assertEquals(IPV4_ADDRESS_PREFIX_BINARY_EID_1, result);
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#asBinaryEid(SimpleAddress, InstanceIdType)} method with ipv6Prefix.
+ */
+ @Test
+ public void asBinaryEidTest_ipv6Prefix() {
+ final Eid result = LispAddressUtil.asBinaryEid(SIMPLE_ADDRESS_IPV6_PREFIX_TEST, INSTANCE_ID_TYPE_TEST);
+ assertEquals(IPV6_ADDRESS_PREFIX_BINARY_EID_1, result);
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#asBinaryEid(SimpleAddress, InstanceIdType)} method with ipv4.
+ */
+ @Test
+ public void asBinaryEidTest_ipv4() {
+ final Eid result = LispAddressUtil.asBinaryEid(SIMPLE_ADDRESS_IPV4_TEST, INSTANCE_ID_TYPE_TEST);
+ assertEquals(IPV4_ADDRESS_BINARY_EID, result);
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#asBinaryEid(SimpleAddress, InstanceIdType)} method with ipv6.
+ */
+ @Test
+ public void asBinaryEidTest_ipv6() {
+ final Eid result = LispAddressUtil.asBinaryEid(SIMPLE_ADDRESS_IPV6_TEST, INSTANCE_ID_TYPE_TEST);
+ assertEquals(IPV6_ADDRESS_BINARY_EID, result);
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#asBinaryEid(SimpleAddress, InstanceIdType)} method with mac.
+ */
+ @Test
+ public void asBinaryEidTest_mac() {
+ final Eid result = LispAddressUtil.asBinaryEid(SIMPLE_ADDRESS_MAC_TEST, INSTANCE_ID_TYPE_TEST);
+ assertEquals(MAC_ADDRESS_EID, result);
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#asIpPrefixBinaryEid(Eid)} method with Ipv4Binary.
+ */
+ @Test
+ public void asIpPrefixBinaryEid_Ipv4Binary() {
+ assertEquals(IPV4_ADDRESS_PREFIX_BINARY_EID_2, LispAddressUtil.asIpPrefixBinaryEid(IPV4_ADDRESS_BINARY_EID));
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#asIpPrefixBinaryEid(Eid)} method with Ipv6Binary.
+ */
+ @Test
+ public void asIpPrefixBinaryEid_Ipv6Binary() {
+ assertEquals(IPV6_ADDRESS_PREFIX_BINARY_EID_2, LispAddressUtil.asIpPrefixBinaryEid(IPV6_ADDRESS_BINARY_EID));
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#asIpPrefixBinaryEid(Eid)} method with Ipv4.
+ */
+ @Test
+ public void asIpPrefixBinaryEid_Ipv4() {
+ assertEquals(IPV4_ADDRESS_PREFIX_BINARY_EID_2, LispAddressUtil.asIpPrefixBinaryEid(IPV4_EID));
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#asIpPrefixBinaryEid(Eid)} method with Ipv4.
+ */
+ @Test
+ public void asIpPrefixBinaryEid_Ipv6() {
+ assertEquals(IPV6_ADDRESS_PREFIX_BINARY_EID_2, LispAddressUtil.asIpPrefixBinaryEid(IPV6_EID));
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#asIpPrefixBinaryEid(Eid)} method with Ipv4Prefix.
+ */
+ @Test
+ public void asIpPrefixBinaryEid_Ipv4Prefix() {
+ assertEquals(IPV4_ADDRESS_PREFIX_BINARY_EID_1, LispAddressUtil.asIpPrefixBinaryEid(IPV4_PREFIX_EID));
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#ipVersionFromString(String)} with ipv4.
*/
@Test
public void ipVersionFromString_ipv4() {
}
/**
- * Tests {@link LispAddressUtil#ipVersionFromString(String)} with ipv6
+ * Tests {@link LispAddressUtil#ipVersionFromString(String)} with ipv6.
*/
@Test
public void ipVersionFromString_ipv6() {
}
/**
- * Tests {@link LispAddressUtil#ipVersionFromString(String)} with incorrect ip address format
+ * Tests {@link LispAddressUtil#ipVersionFromString(String)} with incorrect ip address format.
*/
@Test
public void ipVersionFromString_other() {
*/
@Test
public void asKeyValueAddressEid() {
- final Eid eid = LispAddressUtil.asKeyValueAddressEid(SIMPLE_ADDRESS_A_TEST, SIMPLE_ADDRESS_B_TEST);
- verifyKeyValueAddress(eid, SIMPLE_ADDRESS_A_TEST);
+ final Eid eid = LispAddressUtil.asKeyValueAddressEid(SIMPLE_ADDRESS_IPV4_TEST, SIMPLE_ADDRESS_MAC_TEST);
+ verifyKeyValueAddress(eid, SIMPLE_ADDRESS_IPV4_TEST);
}
/**
*/
@Test
public void asKeyValueAddressRloc() {
- final Rloc rloc = LispAddressUtil.asKeyValueAddressRloc(SIMPLE_ADDRESS_A_TEST, SIMPLE_ADDRESS_B_TEST);
- verifyKeyValueAddress(rloc, SIMPLE_ADDRESS_A_TEST);
+ final Rloc rloc = LispAddressUtil.asKeyValueAddressRloc(SIMPLE_ADDRESS_IPV4_TEST, SIMPLE_ADDRESS_MAC_TEST);
+ verifyKeyValueAddress(rloc, SIMPLE_ADDRESS_IPV4_TEST);
}
/**
*/
@Test
public void asKeyValueAddress() {
- final Rloc rloc = LispAddressUtil.asKeyValueAddress(SIMPLE_ADDRESS_DISTINGUISHED_VALUE_TEST,
- SIMPLE_ADDRESS_B_TEST);
+ final Rloc rloc = LispAddressUtil.asKeyValueAddress(DISTINGUISHED_NAME_TYPE_VALUE_TEST,
+ SIMPLE_ADDRESS_MAC_TEST);
verifyKeyValueAddress(rloc, SIMPLE_ADDRESS_DISTINGUISHED_TEST);
}
((KeyValueAddress) lispAddress.getAddress()).getKeyValueAddress();
assertNotNull(keyValueAddress);
assertEquals(keyValue, keyValueAddress.getKey());
- assertEquals(SIMPLE_ADDRESS_B_TEST, keyValueAddress.getValue());
+ assertEquals(SIMPLE_ADDRESS_MAC_TEST, keyValueAddress.getValue());
}
/**
final SourceDestKey sourceDestKey = LispAddressUtil.asSrcDst(IPV4_ADDRESS_VALUE_TEST,
IPV6_ADDRESS_VALUE_TEST, MASK_OK_TEST, MASK_OK_TEST);
assertNotNull(sourceDestKey);
- assertEquals(SIMPLE_ADDRESS_WITH_IP_PREFIX_IPV4_TEST, sourceDestKey.getSource());
- assertEquals(SIMPLE_ADDRESS_WITH_IP_PREFIX_IPV6_TEST, sourceDestKey.getDest());
+ assertEquals(SIMPLE_ADDRESS_IPV4_PREFIX_TEST, sourceDestKey.getSource());
+ assertEquals(SIMPLE_ADDRESS_IPV6_PREFIX_TEST, sourceDestKey.getDest());
}
/**
- * Tests {@link LispAddressUtil#asSrcDstEid(String, String, int, int, int)} method.
+ * Tests {@link LispAddressUtil#asSrcDstEid(String, String, int, int, long)} method.
*/
@Test
public void asSrcDstEid_addressesAsString() {
.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKey) srcDstEid.getAddress())
.getSourceDestKey();
assertNotNull(sourceDestKey);
- assertEquals(SIMPLE_ADDRESS_WITH_IP_PREFIX_IPV4_TEST, sourceDestKey.getSource());
- assertEquals(SIMPLE_ADDRESS_WITH_IP_PREFIX_IPV6_TEST, sourceDestKey.getDest());
+ assertEquals(SIMPLE_ADDRESS_IPV4_PREFIX_TEST, sourceDestKey.getSource());
+ assertEquals(SIMPLE_ADDRESS_IPV6_PREFIX_TEST, sourceDestKey.getDest());
}
/**
*/
@Test
public void asSrcDstEid_addressesAsSrcDstKey() {
- final SourceDestKey expectedSourceDestKey = new SourceDestKeyBuilder().setSource
- (SIMPLE_ADDRESS_WITH_IP_PREFIX_IPV4_TEST).setDest(SIMPLE_ADDRESS_WITH_IP_PREFIX_IPV6_TEST).build();
+ final SourceDestKey expectedSourceDestKey = new SourceDestKeyBuilder().setSource(
+ SIMPLE_ADDRESS_IPV4_PREFIX_TEST).setDest(SIMPLE_ADDRESS_IPV6_PREFIX_TEST).build();
final Eid srcDstEid = LispAddressUtil.asSrcDstEid(expectedSourceDestKey, INSTANCE_ID_TYPE_TEST);
assertNotNull(srcDstEid);
assertEquals(SourceDestKeyLcaf.class, srcDstEid.getAddressType());
.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKey) srcDstEid.getAddress())
.getSourceDestKey();
assertNotNull(testedSourceDestKey);
- assertEquals(SIMPLE_ADDRESS_WITH_IP_PREFIX_IPV4_TEST, testedSourceDestKey.getSource());
- assertEquals(SIMPLE_ADDRESS_WITH_IP_PREFIX_IPV6_TEST, testedSourceDestKey.getDest());
+ assertEquals(SIMPLE_ADDRESS_IPV4_PREFIX_TEST, testedSourceDestKey.getSource());
+ assertEquals(SIMPLE_ADDRESS_IPV6_PREFIX_TEST, testedSourceDestKey.getDest());
}
/**
*/
@Test
public void asTeLcafRloc() {
- final List<IpAddress> ipAddresses = Arrays.asList(IP_ADDRESS_OBJECT_WITH_IPV4_TEST,
- IP_ADDRESS_OBJECT_WITH_IPV6_TEST);
+ final List<IpAddress> ipAddresses = Arrays.asList(IP_ADDRESS_IPV4_TEST,
+ IP_ADDRESS_IPV6_TEST);
final Rloc rloc = LispAddressUtil.asTeLcafRloc(ipAddresses);
assertNotNull(rloc);
assertEquals(ExplicitLocatorPathLcaf.class, rloc.getAddressType());
final List<Hop> hops = ((ExplicitLocatorPath) rloc.getAddress()).getExplicitLocatorPath().getHop();
assertEquals(hops.size(), ipAddresses.size());
- for(IpAddress ipAddress : ipAddresses) {
- assertTrue("Ip address "+ipAddress+"should be part of hops list.",isIpAddressInHops(ipAddress, hops));
+ for (IpAddress ipAddress : ipAddresses) {
+ assertTrue("Ip address " + ipAddress + "should be part of hops list.", isIpAddressInHops(ipAddress, hops));
}
- for(Hop hop : hops) {
+ for (Hop hop : hops) {
final Hop.LrsBits lrsBits = hop.getLrsBits();
assertFalse(lrsBits.isLookup());
assertFalse(lrsBits.isRlocProbe());
*/
@Test
public void asLocatorRecords() {
- final List<Rloc> expectedRlocs = Arrays.asList(LispAddressUtil.toRloc(IPV4_ADDRESS_TEST), LispAddressUtil.toRloc
- (IPV6_ADDRESS_TEST));
+ final List<Rloc> expectedRlocs = Arrays.asList(LispAddressUtil.toRloc(IPV4_ADDRESS_TEST),
+ LispAddressUtil.toRloc(IPV6_ADDRESS_TEST));
final List<LocatorRecord> locatorRecords = LispAddressUtil.asLocatorRecords(expectedRlocs);
assertEquals(expectedRlocs.size(), locatorRecords.size());
for (Rloc rloc : expectedRlocs) {
- assertTrue("Rloc " + rloc + " should be part of " +
- "locator records list list", isRlocInLocatorRecords(locatorRecords, rloc));
+ assertTrue("Rloc " + rloc + " should be part of "
+ + "locator records list list", isRlocInLocatorRecords(locatorRecords, rloc));
}
for (LocatorRecord locatorRecord : locatorRecords) {
assertFalse(locatorRecord.isLocalLocator());
assertFalse(locatorRecord.isRlocProbed());
assertTrue(locatorRecord.isRouted());
- assertTrue(1 == locatorRecord.getWeight());
- assertTrue(1 == locatorRecord.getPriority());
- assertTrue(1 == locatorRecord.getMulticastWeight());
- assertTrue(1 == locatorRecord.getMulticastPriority());
+ assertTrue(1 == locatorRecord.getWeight().toJava());
+ assertTrue(1 == locatorRecord.getPriority().toJava());
+ assertTrue(1 == locatorRecord.getMulticastWeight().toJava());
+ assertTrue(1 == locatorRecord.getMulticastPriority().toJava());
assertEquals("SFC_LISP", locatorRecord.getLocatorId());
}
}
final Eid noAddressEid = LispAddressUtil.getNoAddressEid();
assertEquals(NoAddressAfi.class, noAddressEid.getAddressType());
assertNull(noAddressEid.getVirtualNetworkId());
- assertTrue(((NoAddress) noAddressEid.getAddress()).isNoAddress());
+ assertEquals(((NoAddress) noAddressEid.getAddress()).getNoAddress(), Empty.getInstance());
}
/**
assertNull(testedAddress);
}
+ /**
+ * Tests {@link LispAddressUtil#convertToBinary(Eid)} method with ipv4Prefix, ipv6Prefix, ipv4, ipv6.
+ */
+ @Test
+ public void convertToBinaryTest_eid() {
+
+ final Eid ipv4PrefixEid = new EidBuilder().setAddress(IPV4_PREFIX).build();
+ final Eid ipv6PrefixEid = new EidBuilder().setAddress(IPV6_PREFIX).build();
+ final Eid ipv4 = new EidBuilder().setAddress(IPV4).build();
+ final Eid ipv6 = new EidBuilder().setAddress(IPV6).build();
+
+ Eid resultIpv4PrefixBinary = LispAddressUtil.convertToBinary(ipv4PrefixEid);
+ verifyToEidWithIpv4PrefixBinary(resultIpv4PrefixBinary, false, MASK_OK_TEST, Ipv4PrefixBinaryAfi.class);
+
+ Eid resultIpv6PrefixBinary = LispAddressUtil.convertToBinary(ipv6PrefixEid);
+ verifyToEidWithIpv6PrefixBinary(resultIpv6PrefixBinary , false, MASK_OK_TEST, Ipv6PrefixBinaryAfi.class);
+
+ Eid resultIpv4Binary = LispAddressUtil.convertToBinary(ipv4);
+ verifyToEidWithIpv4Binary(resultIpv4Binary , false);
+
+ Eid resultIpv6Binary = LispAddressUtil.convertToBinary(ipv6);
+ verifyToEidWithIpv6Binary(resultIpv6Binary , false);
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#convertToBinary(Eid)} method with ipv4Prefix, ipv6Prefix, ipv4, ipv6.
+ */
+ @Test
+ public void convertFromBinaryTest_eid() {
+ final Eid resultIpv4Prefix = LispAddressUtil.convertFromBinary(IPV4_ADDRESS_PREFIX_BINARY_EID_1);
+ verifyToEidWithIpv4Prefix(resultIpv4Prefix, false, MASK_OK_TEST, Ipv4PrefixAfi.class);
+
+ final Eid resultIpv6Prefix = LispAddressUtil.convertFromBinary(IPV6_ADDRESS_PREFIX_BINARY_EID_1);
+ verifyToEidWithIpv6Prefix(resultIpv6Prefix, false, MASK_OK_TEST, Ipv6PrefixAfi.class);
+
+ final Eid resultIpv4 = LispAddressUtil.convertFromBinary(IPV4_ADDRESS_BINARY_EID);
+ verifyToEidWithIpv4(resultIpv4, false);
+
+ final Eid resultIpv6 = LispAddressUtil.convertFromBinary(IPV6_ADDRESS_BINARY_EID);
+ verifyToEidWithIpv6(resultIpv6, false);
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#convertFromBinary(Rloc)} method with ipv4.
+ */
+ @Test
+ public void convertFromBinaryTest_rloc() {
+ final Rloc resultIpv4 = LispAddressUtil.convertFromBinary(IPV4_BINARY_RLOC);
+ verifyToRlocWithIpv4(resultIpv4, false);
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#convertToBinary(Rloc)} method with ipv4.
+ */
+ @Test
+ public void convertToBinaryTest_rloc() {
+ final Rloc resultIpv4Binary = LispAddressUtil.convertToBinary(IPV4_RLOC);
+ verifyToRlocWithIpv4Binary(resultIpv4Binary, false);
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#addressBinaryFromInet(InetAddress)} method with Inet4Address.
+ */
+ @Test
+ public void addressBinaryFromInet_Inet4Address() throws UnknownHostException {
+ final InetAddress inet4Address = InetAddress.getByName(IPV4_ADDRESS_VALUE_TEST);
+
+ assertEquals(new IpAddressBinary(IPV4_ADDRESS_BINARY_TEST),
+ LispAddressUtil.addressBinaryFromInet(inet4Address));
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#addressBinaryFromInet(InetAddress)} method with Inet6Address.
+ */
+ @Test
+ public void addressBinaryFromInet_Inet6Address() throws UnknownHostException {
+ final InetAddress inet4Address = InetAddress.getByName(IPV6_ADDRESS_VALUE_TEST);
+
+ assertEquals(new IpAddressBinary(IPV6_ADDRESS_BINARY_TEST),
+ LispAddressUtil.addressBinaryFromInet(inet4Address));
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#addressBinaryFromInet(InetAddress)} method with null address.
+ */
+ @Test
+ public void addressBinaryFromInet_nullAddress() throws UnknownHostException {
+ assertEquals(new IpAddressBinary(new IpAddressBinary(new Ipv4AddressBinary(new byte[]{127, 0, 0, 1}))),
+ LispAddressUtil.addressBinaryFromInet(null));
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#addressNeedsConversionToBinary} method with ipv4, ipv6, ipv4Prefix, ipv6Prefix and
+ * Ipv4Binary.
+ */
+ @Test
+ public void addressNeedsConversionToBinaryTest() {
+ assertTrue(LispAddressUtil.addressNeedsConversionToBinary(IPV4));
+ assertTrue(LispAddressUtil.addressNeedsConversionToBinary(IPV6));
+ assertTrue(LispAddressUtil.addressNeedsConversionToBinary(IPV4_PREFIX));
+ assertTrue(LispAddressUtil.addressNeedsConversionToBinary(IPV6_PREFIX));
+ assertFalse(LispAddressUtil.addressNeedsConversionToBinary(IPV4_BINARY));
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#addressNeedsConversionToBinary} method with ipv4, ipv6, ipv4Prefix, ipv6Prefix and
+ * Ipv4Binary.
+ */
+ @Test
+ public void addressNeedsConversionFromBinaryTest() {
+ assertTrue(LispAddressUtil.addressNeedsConversionFromBinary(IPV4_BINARY));
+ assertTrue(LispAddressUtil.addressNeedsConversionFromBinary(IPV6_BINARY));
+ assertTrue(LispAddressUtil.addressNeedsConversionFromBinary(IPV4_ADDRESS_PREFIX_BINARY_1));
+ assertTrue(LispAddressUtil.addressNeedsConversionFromBinary(IPV6_ADDRESS_PREFIX_BINARY_1));
+ assertFalse(LispAddressUtil.addressNeedsConversionFromBinary(IPV4));
+ }
+
/**
* Tests {@link LispAddressUtil#compareIpAddressByteArrays(byte[], byte[])} with all possible combination
* of input parameters to reach 100 % coverage.
assertNotNull(eid);
assertEquals(ServicePathLcaf.class, eid.getAddressType());
assertEquals(INSTANCE_ID_TYPE_TEST, eid.getVirtualNetworkId());
- ServicePath servicePath = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.
- address.types.rev151105.lisp.address.address.ServicePath) eid.getAddress()).getServicePath();
+ ServicePath servicePath = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp
+ .address.types.rev151105.lisp.address.address.ServicePath) eid.getAddress()).getServicePath();
assertNotNull(servicePath);
- assertEquals(SERVICE_INDEX_TEST, servicePath.getServiceIndex());
- assertEquals(SERVICE_PATH_ID_TEST, servicePath.getServicePathId().getValue());
+ assertEquals((short) SERVICE_INDEX_TEST, servicePath.getServiceIndex().toJava());
+ assertEquals((long) SERVICE_PATH_ID_TEST, servicePath.getServicePathId().getValue().toJava());
}
/**
*/
@Test
public void toIpPrefixEid() throws UnknownHostException {
- final Eid eid = LispAddressUtil.toIpPrefixEid(IP_ADDRESS_OBJECT_WITH_IPV4_TEST,
+ final Eid eid = LispAddressUtil.toIpPrefixEid(IP_ADDRESS_IPV4_TEST,
INSTANCE_ID_TYPE_VALUE_SHORT_TEST);
verifyEidContainsIpPrefix(eid, MASK_OK_DEFAULT_IPV4_TEST);
}
*/
@Test
public void asEid() {
- final Eid eid = LispAddressUtil.asEid(SIMPLE_ADDRESS_A_TEST, INSTANCE_ID_TYPE_TEST);
+ final Eid eid = LispAddressUtil.asEid(SIMPLE_ADDRESS_IPV4_TEST, INSTANCE_ID_TYPE_TEST);
assertNotNull(eid);
assertEquals(Ipv4BinaryAfi.class, eid.getAddressType());
final Ipv4Binary address = (Ipv4Binary) eid.getAddress();
- assertArrayEquals(InetAddresses.forString(SIMPLE_ADDRESS_A_TEST.getIpAddress().getIpv4Address().getValue())
+ assertArrayEquals(InetAddresses.forString(SIMPLE_ADDRESS_IPV4_TEST.getIpAddress().getIpv4Address().getValue())
.getAddress(), address.getIpv4Binary().getValue());
assertEquals(INSTANCE_ID_TYPE_TEST, eid.getVirtualNetworkId());
}
+ /**
+ * Tests {@link LispAddressUtil#getIpPrefixMask(Eid)} method with Ipv4PrefixBinary.
+ */
+ @Test
+ public void getIpPrefixMask_withIpv4PrefixBinary() {
+ assertEquals(MASK_OK_TEST, LispAddressUtil.getIpPrefixMask(IPV4_ADDRESS_PREFIX_BINARY_EID_1));
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#getIpPrefixMask(Eid)} method with Ipv6PrefixBinary.
+ */
+ @Test
+ public void getIpPrefixMask_withIpv6PrefixBinary() {
+ assertEquals(MASK_OK_TEST, LispAddressUtil.getIpPrefixMask(IPV6_ADDRESS_PREFIX_BINARY_EID_1));
+ }
+
+ /**
+ * Tests {@link LispAddressUtil#getIpPrefixMask(Eid)} method with Ipv4Binary.
+ */
+ @Test
+ public void getIpPrefixMask_withIpv4Binary() {
+ assertEquals((short) 0, LispAddressUtil.getIpPrefixMask(IPV4_ADDRESS_BINARY_EID));
+ }
+
}
Code Review / lispflowmapping.git / blobdiff