/*
- * Copyright (c) 2014 Contextream, Inc. and others. All rights reserved.
+ * Copyright (c) 2014, 2017 Contextream, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
*/
package org.opendaylight.lispflowmapping.integrationtest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_A;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_A_SB;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_B;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_B_SB;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_C;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_C_RLOC_10;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_C_SB;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_C_WP_100_1_SB;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_C_WP_50_2_SB;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D4;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D5;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D_DELETE_SB;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D_WP_100_1_SB;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D_WP_50_2_SB;
+import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_E_SB;
+import static org.ops4j.pax.exam.CoreOptions.composite;
+import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import com.google.common.net.InetAddresses;
import java.io.IOException;
-import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.inject.Inject;
import org.opendaylight.lispflowmapping.config.ConfigIni;
import org.opendaylight.lispflowmapping.implementation.LispMappingService;
import org.opendaylight.lispflowmapping.interfaces.dao.SubKeys;
-import org.opendaylight.lispflowmapping.interfaces.dao.SubscriberRLOC;
+import org.opendaylight.lispflowmapping.interfaces.dao.Subscriber;
import org.opendaylight.lispflowmapping.interfaces.lisp.IFlowMapping;
import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
-import org.opendaylight.lispflowmapping.lisp.serializer.MapNotifySerializer;
import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer;
import org.opendaylight.lispflowmapping.lisp.serializer.MapReplySerializer;
import org.opendaylight.lispflowmapping.lisp.serializer.MapRequestSerializer;
import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
+import org.opendaylight.lispflowmapping.lisp.type.MappingData;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
+import org.opendaylight.lispflowmapping.lisp.util.MappingRecordUtil;
import org.opendaylight.lispflowmapping.type.sbplugin.IConfigLispSouthboundPlugin;
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.yang.types.rev130715.MacAddress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.Ipv4PrefixBinaryAfi;
-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.Ipv4PrefixBinaryBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.AddMapping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapNotify;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapReply;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRequest;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MappingKeepAlive;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MessageType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.OdlLispProtoListener;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.RequestMapping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrReplyMapping;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_A;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_A_SB;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_B;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_B_SB;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_C;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_C_RLOC_10;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_C_SB;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_C_WP_100_1_SB;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_C_WP_50_2_SB;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D4;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D5;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D_DELETE_SB;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D_WP_100_1_SB;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_D_WP_50_2_SB;
-import static org.opendaylight.lispflowmapping.integrationtest.MultiSiteScenarioUtil.SITE_E_SB;
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class MappingServiceIntegrationTest extends AbstractMdsalTestBase {
private static final Logger LOG = LoggerFactory.getLogger(MappingServiceIntegrationTest.class);
- /**
- * Defines how many attempt to create instance of DatagramSocket will be done before giving up.
- */
- private static final int NUM_OF_ATTEMPTS_TO_CREATE_SOCKET = 2;
-
private byte[] mapRequestPacket;
private byte[] mapRegisterPacketWithNotify;
private byte[] mapRegisterPacketWithoutNotify;
public static final String ODL = "org.opendaylight.controller";
public static final String YANG = "org.opendaylight.yangtools";
+ private static final int MULTI_SITE_SLEEP_TIME = 2;
private static final int MAX_NOTIFICATION_RETRYS = 20;
private static final MappingAuthkey NULL_AUTH_KEY = new MappingAuthkeyBuilder().setKeyType(0).build();
public String getKarafDistro() {
return maven()
.groupId("org.opendaylight.lispflowmapping")
- .artifactId("distribution-karaf")
+ .artifactId("lispflowmapping-karaf")
.versionAsInProject()
.type("zip")
.getURL();
public Option getLoggingOption() {
Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
"log4j.logger.org.opendaylight.lispflowmapping",
- LogLevel.DEBUG.name());
+ LogLevel.TRACE.name());
option = composite(option, super.getLoggingOption());
return option;
}
if (socket != null) {
socket.close();
}
-// if (connection != null) {
-// connection.disconnect();
-// }
+ // reset mapping record validity to default value
+ ConfigIni.getInstance().setRegistrationValiditySb(200000L);
}
@Before
public void before() throws Exception {
areWeReady();
mapService.setLookupPolicy(IMappingService.LookupPolicy.NB_FIRST);
- mapService.setMappingOverwrite(true);
+ mapService.setMappingMerge(false);
+ ConfigIni.getInstance().setSmrRetryCount(1);
- locatorEid = LispAddressUtil.asIpv4Rloc("4.3.2.1");
- socket = initSocket(socket, LispMessage.PORT_NUM);
+ socket = MappingServiceIntegrationTestUtil.initSocket(LispMessage.PORT_NUM);
// SRC: 127.0.0.1:58560 to 127.0.0.1:4342
// LISP(Type = 8 - Encapsulated)
// Nonce: 0x3d8d2acd39c8d608
// ITR-RLOC AFI=1 Address=192.168.136.10
// Record 1: 153.16.254.1/32
- mapRequestPacket = extractWSUdpByteArray(new String("0000 00 00 00 00 00 00 00 00 00 00 00 00 08 00 45 00 " //
+ mapRequestPacket = extractWSUdpByteArray("0000 00 00 00 00 00 00 00 00 00 00 00 00 08 00 45 00 "
+ "0010 00 58 00 00 40 00 40 11 3c 93 7f 00 00 01 7f 00 "
+ "0020 00 01 e4 c0 10 f6 00 44 fe 57 80 00 00 00 45 00 "
+ "0030 00 3c d4 31 00 00 ff 11 56 f3 7f 00 00 02 99 10 "
+ "0040 fe 01 dd b4 10 f6 00 28 ef 3a 10 00 00 01 3d 8d "
- + "0050 2a cd 39 c8 d6 08 00 01 01 02 03 04 00 01 7f 00 00 02 00 20 " //
- + "0060 00 01 99 10 fe 01"));
+ + "0050 2a cd 39 c8 d6 08 00 01 01 02 03 04 00 01 7f 00 00 02 00 20 "
+ + "0060 00 01 99 10 fe 01");
// IP: 192.168.136.10 -> 128.223.156.35
// UDP: 49289 -> 4342
// 255/0
//
- mapRegisterPacketWithAuthenticationAndMapNotify = extractWSUdpByteArray(new String(
- "0000 00 50 56 ee d1 4f 00 0c 29 7a ce 79 08 00 45 00 " //
+ mapRegisterPacketWithAuthenticationAndMapNotify = extractWSUdpByteArray(
+ "0000 00 50 56 ee d1 4f 00 0c 29 7a ce 79 08 00 45 00 "
+ "0010 00 5c 00 00 40 00 40 11 d4 db c0 a8 88 0a 80 df "
+ "0020 9c 23 d6 40 10 f6 00 48 59 a4 38 00 01 01 00 00 "
+ "0030 00 00 00 00 00 00 00 01 00 14 0e a4 c6 d8 a4 06 "
+ "0040 71 7c 33 a4 5c 4a 83 1c de 74 53 03 0c ad 00 00 "
- + "0050 00 0a 01 20 10 00 00 00 00 01 99 10 fe 01 01 64 " //
- + "0060 ff 00 00 05 00 01 c0 a8 88 0a"));
+ + "0050 00 0a 01 20 10 00 00 00 00 01 99 10 fe 01 01 64 "
+ + "0060 ff 00 00 05 00 01 c0 a8 88 0a");
// IP: 192.168.136.10 -> 128.223.156.35
// UDP: 49289 -> 4342
// 255/0
//
- mapRegisterPacketWithNotify = extractWSUdpByteArray(new String(
- "0000 00 50 56 ee d1 4f 00 0c 29 7a ce 79 08 00 45 00 " //
+ mapRegisterPacketWithNotify = extractWSUdpByteArray(
+ "0000 00 50 56 ee d1 4f 00 0c 29 7a ce 79 08 00 45 00 "
+ "0010 00 5c 00 00 40 00 40 11 d4 db c0 a8 88 0a 80 df "
+ "0020 9c 23 d6 40 10 f6 00 48 59 a4 38 00 01 01 00 00 "
+ "0030 00 00 00 00 00 07 00 00 00 14 0e a4 c6 d8 a4 06 "
+ "0040 71 7c 33 a4 5c 4a 83 1c de 74 53 03 0c ad 00 00 "
- + "0050 00 0a 01 20 10 00 00 00 00 01 99 10 fe 01 01 64 " //
- + "0060 ff 00 00 05 00 01 c0 a8 88 0a"));
+ + "0050 00 0a 01 20 10 00 00 00 00 01 99 10 fe 01 01 64 "
+ + "0060 ff 00 00 05 00 01 c0 a8 88 0a");
// IP: 192.168.136.10 -> 128.223.156.35
// UDP: 49289 -> 4342
// 255/0
//
- mapRegisterPacketWithoutNotify = extractWSUdpByteArray(new String(
- "0000 00 50 56 ee d1 4f 00 0c 29 7a ce 79 08 00 45 00 " //
+ mapRegisterPacketWithoutNotify = extractWSUdpByteArray(
+ "0000 00 50 56 ee d1 4f 00 0c 29 7a ce 79 08 00 45 00 "
+ "0010 00 5c 00 00 40 00 40 11 d4 db c0 a8 88 0a 80 df "
+ "0020 9c 23 d6 40 10 f6 00 48 59 a4 38 00 00 01 00 00 "
+ "0030 00 00 00 00 00 07 00 00 00 14 0e a4 c6 d8 a4 06 "
+ "0040 71 7c 33 a4 5c 4a 83 1c de 74 53 03 0c ad 00 00 "
- + "0050 00 0a 01 20 10 00 00 00 00 01 99 10 fe 01 01 64 " //
- + "0060 ff 00 00 05 00 01 c0 a8 88 0a"));
+ + "0050 00 0a 01 20 10 00 00 00 00 01 99 10 fe 01 01 64 "
+ + "0060 ff 00 00 05 00 01 c0 a8 88 0a");
}
@Inject
@Test
public void testTimeOuts() throws Exception {
+ timedOutMappingRecord();
mapRequestMapRegisterAndMapRequestTestTimeout();
//mapRequestMapRegisterAndMapRequestTestNativelyForwardTimeoutResponse(); TODO commented because it needs NB
}
@Test
public void testSmr() throws Exception {
registerQueryRegisterWithSmr();
- testRepeatedSmr();
+ //testRepeatedSmr();
}
@Test
}
@Test
- public void testNegativePrefix() throws UnknownHostException {
+ public void testNbAndSbNegativePrefix() throws UnknownHostException {
insertMappings();
testGapIntersection();
+
+ insertMappings();
testMultipleMappings();
}
+ @Test
+ public void testExplicitSbNegativePrefixes() {
+ // https://bugs.opendaylight.org/show_bug.cgi?id=8679
+ testNegativePrefix();
+
+ // https://bugs.opendaylight.org/show_bug.cgi?id=9023
+ testPositiveMappingRemoval();
+
+ // https://bugs.opendaylight.org/show_bug.cgi?id=9037
+ testPositivePrefixOverlappingNegativePrefix_moreSpecific();
+
+ // https://bugs.opendaylight.org/show_bug.cgi?id=9116
+ testPositivePrefixOverlappingNegativePrefix_lessSpecific();
+ }
+
+ @Test
+ public void testMappingChangeCases() {
+ testSubtree();
+ }
+
private void testRepeatedSmr() throws SocketTimeoutException, UnknownHostException {
cleanUP();
long timeout = ConfigIni.getInstance().getSmrTimeout();
+ ConfigIni.getInstance().setSmrRetryCount(5);
final InstanceIdType iid = new InstanceIdType(1L);
final Eid eid1 = LispAddressUtil.asIpv4Eid("1.1.1.1", 1L);
- final Eid eid2 = LispAddressUtil.asIpv4Eid("2.2.2.2", 1L);
+ final Eid subscriberEid = LispAddressUtil.asIpv4Eid("2.2.2.2", 1L);
+ final int expectedSmrs1 = 2;
+ final int expectedSmrs2 = 3;
/* set auth */
final Eid eid = LispAddressUtil.asIpv4PrefixBinaryEid("0.0.0.0/0", iid);
/* add subscribers */
final String subscriberSrcRloc1 = "127.0.0.3";
final String subscriberSrcRloc2 = "127.0.0.4";
- final Set<SubscriberRLOC> subscriberSet = Sets.newHashSet(
- newSubscriber(eid1, subscriberSrcRloc1), newSubscriber(eid2, subscriberSrcRloc2));
- mapService.addData(MappingOrigin.Southbound, eid1, SubKeys.SUBSCRIBERS, subscriberSet);
-
- final int expectedSmrs1 = 2;
- final int expectedSmrs2 = 3;
+ final Set<Subscriber> subscriberSet1 = Sets.newHashSet(newSubscriber(subscriberEid, subscriberSrcRloc1),
+ newSubscriber(subscriberEid, subscriberSrcRloc2));
+ mapService.addData(MappingOrigin.Southbound, eid1, SubKeys.SUBSCRIBERS, subscriberSet1);
final SocketReader reader1 = startSocketReader(subscriberSrcRloc1, 15000);
final SocketReader reader2 = startSocketReader(subscriberSrcRloc2, 15000);
/* add mapping */
final MappingRecord mapping1 = new MappingRecordBuilder()
.setEid(eid1).setTimestamp(System.currentTimeMillis()).setRecordTtl(1440).build();
- mapService.addMapping(MappingOrigin.Northbound, mapping1.getEid(), null, mapping1, false);
+ mapService.addMapping(MappingOrigin.Northbound, eid1, null, new MappingData(mapping1));
- sleepForMilliseconds((timeout * expectedSmrs1) - 1500);
- final List<MapRequest> requests1 = processBuffers(reader1, subscriberSrcRloc1, expectedSmrs1);
+ sleepForMilliseconds((timeout * expectedSmrs1) - (timeout / 2));
+ final List<MapRequest> requests1 = processSmrPackets(reader1, subscriberSrcRloc1, expectedSmrs1);
final MapReply mapReply1 = lms.handleMapRequest(
new MapRequestBuilder(requests1.get(0))
+ .setSourceEid(new SourceEidBuilder().setEid(subscriberEid).build())
.setItrRloc(Lists.newArrayList(new ItrRlocBuilder()
.setRloc(LispAddressUtil.asIpv4Rloc(subscriberSrcRloc1)).build()))
.setEidItem(Lists.newArrayList(new EidItemBuilder().setEid(eid1).build()))
// sleep to get 1 extra smr request
sleepForMilliseconds(timeout * 1);
- final List<MapRequest> requests2 = processBuffers(reader2, subscriberSrcRloc2, expectedSmrs2);
+ final List<MapRequest> requests2 = processSmrPackets(reader2, subscriberSrcRloc2, expectedSmrs2);
final MapReply mapReply2 = lms.handleMapRequest(
new MapRequestBuilder(requests2.get(0))
+ .setSourceEid(new SourceEidBuilder().setEid(subscriberEid).build())
.setItrRloc(Lists.newArrayList(new ItrRlocBuilder()
.setRloc(LispAddressUtil.asIpv4Rloc(subscriberSrcRloc2)).build()))
- .setEidItem(Lists.newArrayList(new EidItemBuilder().setEid(eid2).build()))
+ .setEidItem(Lists.newArrayList(new EidItemBuilder().setEid(eid1).build()))
.setSmrInvoked(true)
.setSmr(false).build());
return SocketReader.startReadingInStandaloneThread(receivingSocket, timeout);
}
- private List<MapRequest> processBuffers(SocketReader reader, String address, int expectedSmrs) {
+ private List<MapRequest> processSmrPackets(SocketReader reader, String address, int expectedSmrs) {
InetAddress inetAddress = null;
try {
inetAddress = InetAddress.getByName(address);
final List<MapRequest> requests = Lists.newArrayList();
byte[][] buffers = reader.getBuffers(expectedSmrs);
for (byte[] buf : buffers) {
- MapRequest request = MapRequestSerializer.getInstance().deserialize(ByteBuffer.wrap(buf), inetAddress);
- requests.add(request);
+ ByteBuffer packet = ByteBuffer.wrap(buf);
+ if (MappingServiceIntegrationTestUtil.checkType(packet, MessageType.MapRequest)) {
+ MapRequest request = MapRequestSerializer.getInstance().deserialize(packet, inetAddress);
+ requests.add(request);
+ }
}
return requests;
}
private void assertNextBufferEmpty(SocketReader socketReader) {
- assertTrue(isArrayEmpty(socketReader.getBuffers(1)[0]));
+ assertTrue(MultiSiteScenario.areBuffersEmpty(socketReader.getBuffers(1)));
}
- private boolean isArrayEmpty(byte[] byteArray) {
- for (byte b : byteArray) {
- if (b != 0) {
- return false;
- }
- }
- return true;
- }
-
- private static SubscriberRLOC newSubscriber(Eid srcEid, String srcRlocIp) {
- final byte[] addressBinary = InetAddresses.forString(srcRlocIp).getAddress();
+ private static Subscriber newSubscriber(Eid srcEid, String srcRlocIp) {
final int timeout = 5;
- final Rloc srcRloc = new RlocBuilder().setAddress(new Ipv4BinaryBuilder()
- .setIpv4Binary(new Ipv4AddressBinary(addressBinary)).build()).build();
-
- return new SubscriberRLOC(srcRloc, srcEid, timeout);
+ final Rloc srcRloc = LispAddressUtil.asIpv4Rloc(srcRlocIp);
+ return new Subscriber(srcRloc, srcEid, timeout);
}
private void testMultipleMappings() throws UnknownHostException {
.setIpv4AddressBinary(new Ipv4AddressBinary(InetAddress.getByName(resultPrefix1).getAddress()))
.setIpv4MaskLength((short) 18).build();
- final String resultPrefix2 = "1.1.192.0";
+ final String resultPrefix2 = "1.1.128.0";
final Address resultMapping2 = new Ipv4PrefixBinaryBuilder()
.setIpv4AddressBinary(new Ipv4AddressBinary(InetAddress.getByName(resultPrefix2).getAddress()))
- .setIpv4MaskLength((short) 18).build();
+ .setIpv4MaskLength((short) 17).build();
final String resultPrefix3 = "1.3.0.0";
final Address resultNegMapping3 = new Ipv4PrefixBinaryBuilder()
* Tests a negative mapping from an intersection of gaps in northbound and southbound.
*/
private void testGapIntersection() throws UnknownHostException {
- final InstanceIdType iid = new InstanceIdType(1L);
-
// request an Eid from a gap between mappings
- final MapRequest mapRequest = new MapRequestBuilder().setSmrInvoked(false).setEidItem(Lists.newArrayList(
- new EidItemBuilder().setEid(LispAddressUtil.asIpv4PrefixBinaryEid("1.1.127.10/32", iid))
- .build()))
- .build();
- final MapReply mapReply = lms.handleMapRequest(mapRequest);
+ final MapReply mapReply = lms.handleMapRequest(newMapRequest(1L, "1.1.127.10/32"));
// expected negative mapping
final Address resultNegMapping = new Ipv4PrefixBinaryBuilder()
.getAddress());
}
+ private void testNegativePrefix() {
+ // First, we test with one mapping in NB and one mapping in SB
+ cleanUP();
+
+ insertNBMappings(1L, "192.0.2.0/24");
+ insertSBMappings(1L, "10.0.0.0/32");
+
+ restartSocket();
+ sleepForSeconds(2);
+
+ MapReply mapReply = lms.handleMapRequest(newMapRequest(1L, "11.1.1.1/32"));
+ Eid expectedNegativePrefix = LispAddressUtil.asIpv4PrefixBinaryEid(1L, "11.0.0.0/8");
+ assertEquals(expectedNegativePrefix, mapReply.getMappingRecordItem().get(0).getMappingRecord().getEid());
+ assertTrue(MappingRecordUtil.isNegativeMapping(mapReply.getMappingRecordItem().get(0).getMappingRecord()));
+
+ // Second, we test with two mappings in NB only
+ cleanUP();
+
+ insertNBMappings(1L, "192.167.0.0/16", "192.169.0.0/16");
+
+ restartSocket();
+ sleepForSeconds(2);
+
+ mapReply = lms.handleMapRequest(newMapRequest(1L, "192.168.0.1/32"));
+ expectedNegativePrefix = LispAddressUtil.asIpv4PrefixBinaryEid(1L, "192.168.0.0/16");
+ MappingRecord mr = mapReply.getMappingRecordItem().get(0).getMappingRecord();
+ assertEquals(expectedNegativePrefix, mr.getEid());
+ assertTrue(MappingRecordUtil.isNegativeMapping(mr));
+ }
+
+ private void testPositiveMappingRemoval() {
+ cleanUP();
+
+ insertNBMappings(1L, "192.167.0.0/16", "192.169.0.0/16");
+ insertSBMappings(1L, "192.168.32.0/19");
+
+ MapReply mapReply = lms.handleMapRequest(newMapRequest(1L, "192.168.0.1/32"));
+ Eid expectedNegativePrefix = LispAddressUtil.asIpv4PrefixBinaryEid(1L, "192.168.0.0/19");
+ MappingRecord mr = mapReply.getMappingRecordItem().get(0).getMappingRecord();
+ assertEquals(expectedNegativePrefix, mr.getEid());
+ assertTrue(MappingRecordUtil.isNegativeMapping(mr));
+
+ mapReply = lms.handleMapRequest(newMapRequest(1L, "192.168.64.1/32"));
+ expectedNegativePrefix = LispAddressUtil.asIpv4PrefixBinaryEid(1L, "192.168.64.0/18");
+ mr = mapReply.getMappingRecordItem().get(0).getMappingRecord();
+ assertEquals(expectedNegativePrefix, mr.getEid());
+ assertTrue(MappingRecordUtil.isNegativeMapping(mr));
+
+ mapReply = lms.handleMapRequest(newMapRequest(1L, "192.168.128.1/32"));
+ expectedNegativePrefix = LispAddressUtil.asIpv4PrefixBinaryEid(1L, "192.168.128.0/17");
+ mr = mapReply.getMappingRecordItem().get(0).getMappingRecord();
+ assertEquals(expectedNegativePrefix, mr.getEid());
+ assertTrue(MappingRecordUtil.isNegativeMapping(mr));
+
+ printMapCacheState();
+
+ mapService.removeMapping(MappingOrigin.Southbound, LispAddressUtil.asIpv4PrefixBinaryEid(
+ 1L, "192.168.32.0/19"));
+
+ printMapCacheState();
+
+ mapReply = lms.handleMapRequest(newMapRequest(1L, "192.168.32.1/32"));
+ expectedNegativePrefix = LispAddressUtil.asIpv4PrefixBinaryEid(1L, "192.168.0.0/16");
+ mr = mapReply.getMappingRecordItem().get(0).getMappingRecord();
+ assertEquals(expectedNegativePrefix, mr.getEid());
+ assertTrue(MappingRecordUtil.isNegativeMapping(mr));
+
+ printMapCacheState();
+ }
+
+ private void testPositivePrefixOverlappingNegativePrefix_moreSpecific() {
+ cleanUP();
+
+ insertNBMappings(1L, "192.167.0.0/16", "192.169.0.0/16");
+
+ MapReply mapReply = lms.handleMapRequest(newMapRequest(1L, "192.168.0.1/32"));
+ Eid expectedNegativePrefix = LispAddressUtil.asIpv4PrefixBinaryEid(1L, "192.168.0.0/16");
+ MappingRecord mr = mapReply.getMappingRecordItem().get(0).getMappingRecord();
+ assertEquals(expectedNegativePrefix, mr.getEid());
+ assertTrue(MappingRecordUtil.isNegativeMapping(mr));
+
+ insertNBMappings(1L, "192.168.1.0/24");
+
+ mapReply = lms.handleMapRequest(newMapRequest(1L, "192.168.0.1/32"));
+ expectedNegativePrefix = LispAddressUtil.asIpv4PrefixBinaryEid(1L, "192.168.0.0/24");
+ mr = mapReply.getMappingRecordItem().get(0).getMappingRecord();
+ assertEquals(expectedNegativePrefix, mr.getEid());
+ assertTrue(MappingRecordUtil.isNegativeMapping(mr));
+ }
+
+ private void testPositivePrefixOverlappingNegativePrefix_lessSpecific() {
+ cleanUP();
+
+ insertNBMappings(1L, "192.167.0.0/16", "192.169.0.0/16");
+
+ MapReply mapReply = lms.handleMapRequest(newMapRequest(1L, "192.168.0.1/32"));
+ Eid expectedNegativePrefix = LispAddressUtil.asIpv4PrefixBinaryEid(1L, "192.168.0.0/16");
+ MappingRecord mr = mapReply.getMappingRecordItem().get(0).getMappingRecord();
+ assertEquals(expectedNegativePrefix, mr.getEid());
+ assertTrue(MappingRecordUtil.isNegativeMapping(mr));
+
+ insertNBMappings(1L, "192.0.0.0/8");
+
+ mapReply = lms.handleMapRequest(newMapRequest(1L, "192.168.0.1/32"));
+ Eid expectedPositivePrefix = LispAddressUtil.asIpv4PrefixBinaryEid(1L, "192.0.0.0/8");
+ mr = mapReply.getMappingRecordItem().get(0).getMappingRecord();
+ assertEquals(expectedPositivePrefix, mr.getEid());
+ assertTrue(MappingRecordUtil.isPositiveMapping(mr));
+ }
+
+ private void testSubtree() {
+ cleanUP();
+
+ insertSBMappings(1L, "10.0.0.0/8",
+ "10.0.0.0/16", "10.2.0.0/16", "10.255.0.0/16");
+ Eid queryPrefix = LispAddressUtil.asIpv4PrefixBinaryEid(1L, "10.0.0.0/9");
+ Set<Eid> subtreePrefixes = mapService.getSubtree(MappingOrigin.Southbound, queryPrefix);
+ LOG.debug("Subtree prefix set for EID {}: {}", LispAddressStringifier.getString(queryPrefix),
+ LispAddressStringifier.getString(subtreePrefixes));
+ Set<Eid> expectedSubtreePrefixes = new HashSet<>();
+ expectedSubtreePrefixes.add(LispAddressUtil.asIpv4PrefixBinaryEid(1L, "10.0.0.0/16"));
+ expectedSubtreePrefixes.add(LispAddressUtil.asIpv4PrefixBinaryEid(1L, "10.2.0.0/16"));
+ assertEquals(expectedSubtreePrefixes, subtreePrefixes);
+ }
+
private void insertMappings() {
cleanUP();
mapService.setLookupPolicy(IMappingService.LookupPolicy.NB_AND_SB);
- final InstanceIdType iid = new InstanceIdType(1L);
- final String prefixNbLeft = "1.2.0.0/16";
- final String prefixNbRight = "1.1.128.0/17";
- final String prefixSbLeft = "1.1.32.0/19";
- final String prefixSbRight = "1.0.0.0/8";
+ insertNBMappings(1L, "1.2.0.0/16", "1.1.128.0/17");
+ insertSBMappings(1L, "1.1.32.0/19", "1.0.0.0/8");
- final MappingRecord mapRecordNbLeft = newMappingRecord(prefixNbLeft, iid);
- final MappingRecord mapRecordNbRight = newMappingRecord(prefixNbRight, iid);
- final MappingRecord mapRecordSbLeft = newMappingRecord(prefixSbLeft, iid);
- final MappingRecord mapRecordSbRight = newMappingRecord(prefixSbRight, iid);
+ restartSocket();
+ sleepForSeconds(2);
+ }
- /* set auth */
- final Eid eid = LispAddressUtil.asIpv4PrefixBinaryEid("0.0.0.0/0", iid);
+ private void insertNBMappings(long iid, String ... prefixes) {
+ LOG.debug("Adding Northbound mappings for prefixes: {}", prefixes);
+ final InstanceIdType iiType = new InstanceIdType(iid);
+ for (String prefix : prefixes) {
+ MappingRecord record = newMappingRecord(prefix, iiType);
+ mapService.addMapping(MappingOrigin.Northbound, record.getEid(), null, new MappingData(record));
+ }
+ sleepForMilliseconds(25);
+ printMapCacheState();
+ }
+
+ private void insertSBMappings(long iid, String ... prefixes) {
+ LOG.debug("Adding Southbound mappings for prefixes: {}", prefixes);
+ final InstanceIdType iiType = new InstanceIdType(iid);
+ Eid eid = LispAddressUtil.asIpv4PrefixBinaryEid("0.0.0.0/0", iiType);
mapService.addAuthenticationKey(eid, NULL_AUTH_KEY);
- mapService.addMapping(MappingOrigin.Northbound, mapRecordNbLeft.getEid(), null, mapRecordNbLeft, false);
- mapService.addMapping(MappingOrigin.Northbound, mapRecordNbRight.getEid(), null, mapRecordNbRight, false);
- mapService.addMapping(MappingOrigin.Southbound, mapRecordSbLeft.getEid(), null, mapRecordSbLeft, false);
- mapService.addMapping(MappingOrigin.Southbound, mapRecordSbRight.getEid(), null, mapRecordSbRight, false);
+ for (String prefix : prefixes) {
+ MappingRecord record = newMappingRecord(prefix, iiType);
+ mapService.addMapping(MappingOrigin.Southbound, record.getEid(), null,
+ new MappingData(record, System.currentTimeMillis()));
+ }
+ printMapCacheState();
+ }
- restartSocket();
- sleepForSeconds(2);
+ private void printMapCacheState() {
+ LOG.debug("Map-cache state:\n{}", mapService.prettyPrintMappings());
}
- /**
- * Creates a new MappingRecord object.
- *
- * @param prefix The Eid prefix
- * @param iid VNI
- * @return new MappingRecord object
- */
private MappingRecord newMappingRecord(String prefix, InstanceIdType iid) {
final Eid prefixBinary = LispAddressUtil.asIpv4PrefixBinaryEid(prefix, iid);
- return new MappingRecordBuilder()
- .setEid(prefixBinary)
- .setLocatorRecord(Lists.newArrayList(new LocatorRecordBuilder()
- .setRloc(LispAddressUtil.asIpv4Rloc("2.2.2.2")).setLocatorId("loc_id").build()))
- .setTimestamp(System.currentTimeMillis()).setRecordTtl(1440).build();
+ return MappingServiceIntegrationTestUtil.getDefaultMappingRecordBuilder(prefixBinary).build();
+ }
+
+ private MapRequest newMapRequest(long iid, String prefix) {
+ final Eid prefixBinary = LispAddressUtil.asIpv4PrefixBinaryEid(prefix, new InstanceIdType(iid));
+ return MappingServiceIntegrationTestUtil.getDefaultMapRequestBuilder(prefixBinary).build();
}
/**
public void testMultiSiteScenarioA() throws IOException {
cleanUP();
ConfigIni.getInstance().setSmrRetryCount(1);
+ ConfigIni.getInstance().setSmrTimeout(30000L);
final MultiSiteScenario multiSiteScenario = new MultiSiteScenario(mapService, lms);
multiSiteScenario.setCommonAuthentication();
multiSiteScenario.storeSouthboundMappings(false, SITE_A, SITE_B, SITE_C, SITE_D4, SITE_D5);
multiSiteScenario.storeNorthMappingSrcDst(SITE_B, SITE_C);
multiSiteScenario.storeNorthMappingNegative(SITE_C, Action.Drop);
- sleepForSeconds(2);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.assertPingWorks(SITE_A, 5, SITE_B, 4);
multiSiteScenario.assertPingWorks(SITE_B, 5, SITE_C, 4);
multiSiteScenario.assertPingFails(SITE_A, 1, SITE_C, 4);
//TEST CASE 2
- //following action should trigger generatting of SMR messages:
+ //following action should trigger generating of SMR messages:
// 1) 192.0.2.5/32
// 2) 192.0.1.1/32
multiSiteScenario.storeNorthMappingSrcDst(SITE_A, SITE_C);
- sleepForSeconds(2);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B.getHost(5), SITE_A.getHost(1));
multiSiteScenario.assertPingWorks(SITE_A, 5, SITE_C, 4);
multiSiteScenario.assertPingWorks(SITE_B, 5, SITE_C, 4);
multiSiteScenario.assertPingFails(SITE_D4, 5, SITE_C, 4);
//TEST CASE 3
- // following action should trigger generatting of SMR messages:
+ // following action should trigger generating of SMR messages:
// 1) 192.0.2.5/32
// 2) 192.0.1.1/32
// 3) 192.0.1.5/32
// 4) 192.0.4.5/32
multiSiteScenario.deleteNorthMappingNegative(SITE_C);
- sleepForSeconds(2);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B.getHost(5), SITE_A.getHost(1), SITE_A
.getHost(5),
SITE_D4.getHost(5));
multiSiteScenario.assertPingWorks(SITE_D4, 5, SITE_C, 4);
//TEST CASE 4
- // following action should trigger generatting of SMR messages:
- // 1) 192.0.4.5/32
+ // following action should trigger generating of SMR messages:
+ // 1) 192.0.2.5/32
+ // 2) 192.0.1.1/32
+ // 3) 192.0.1.5/32
+ // 4) 192.0.4.5/32
multiSiteScenario.storeNorthMappingSrcDst(SITE_B, SITE_C_RLOC_10);
- sleepForSeconds(2);
- multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_D4.getHost(5));
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
+ multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B.getHost(5), SITE_A.getHost(1),
+ SITE_A.getHost(5), SITE_D4.getHost(5));
//way of testing ping - get RLOC for mapping src-dst and compare it with awaited value doesn't test
//that ping won't be successfull
multiSiteScenario.assertPingFails(SITE_B, 5, SITE_C, 4);
//TEST CASE 5
- // following action should trigger generatting of SMR messages:
- // 1) 192.0.4.5/32
- // 2) 192.0.2.5/32
+ // following action should trigger generating of SMR messages:
+ // 1) 192.0.2.5/32
+ // 2) 192.0.1.1/32
+ // 3) 192.0.1.5/32
+ // 4) 192.0.4.5/32
multiSiteScenario.storeNorthMappingNegative(SITE_C, Action.Drop);
- sleepForSeconds(2);
- multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_D4.getHost(5), SITE_B.getHost(5));
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
+ multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B.getHost(5), SITE_A.getHost(1),
+ SITE_A.getHost(5), SITE_D4.getHost(5));
multiSiteScenario.assertPingFails(SITE_D4, 5, SITE_C, 4);
//TEST CASE 6
multiSiteScenario.assertPingFails(SITE_D5, 5, SITE_C, 3);
//TEST CASE 7
- multiSiteScenario.deleteNorthMapingSrcDst(SITE_A, SITE_C);
- sleepForSeconds(2);
- // following action should trigger generatting of SMR messages:
+ // following action should trigger generating of SMR messages:
// 1) 192.0.4.5/32
// 2) 192.0.2.5/32
// 3) 192.0.5.5/32
+ // 4) 192.0.1.5/32
+ // 5) 192.0.1.1/32
+ multiSiteScenario.deleteNorthMapingSrcDst(SITE_A, SITE_C);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_D5.getHost(5), SITE_D4.getHost(5),
- SITE_B.getHost(5));
+ SITE_B.getHost(5), SITE_A.getHost(1), SITE_A.getHost(5));
- // following action should trigger generatting of SMR messages:
+ // following action should trigger generating of SMR messages:
// 1) 192.0.4.5/32
// 2) 192.0.2.5/32
// 3) 192.0.5.5/32
+ // 4) 192.0.1.5/32
+ // 5) 192.0.1.1/32
multiSiteScenario.storeNorthMappingSrcDst(SITE_B, SITE_C);
- sleepForSeconds(2);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_D5.getHost(5), SITE_D4.getHost(5),
- SITE_B.getHost(5));
+ SITE_B.getHost(5), SITE_A.getHost(1), SITE_A.getHost(5));
multiSiteScenario.assertPingWorks(SITE_A, 5, SITE_B, 4);
multiSiteScenario.assertPingWorks(SITE_B, 5, SITE_C, 4);
multiSiteScenario.assertPingFails(SITE_A, 1, SITE_C, 4);
//TEST CASE 8
- // following action should trigger generatting of SMR messages:
+ // following action should trigger generating of SMR messages:
// 1) 192.0.4.5/32
// 2) 192.0.2.5/32
// 3) 192.0.5.5/32
- // 4) 192.0.1.1/32
+ // 4) 192.0.1.5/32
+ // 5) 192.0.1.1/32
multiSiteScenario.deleteNorthMapingSrcDst(SITE_B, SITE_C);
- sleepForSeconds(2);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_D5.getHost(5), SITE_D4.getHost(5),
- SITE_B.getHost(5),
- SITE_A.getHost(1));
+ SITE_B.getHost(5), SITE_A.getHost(1), SITE_A.getHost(5));
multiSiteScenario.assertPingWorks(SITE_A, 5, SITE_B, 4);
multiSiteScenario.assertPingFails(SITE_B, 5, SITE_C, 4);
multiSiteScenario.assertPingFails(SITE_A, 1, SITE_C, 4);
//TEST CASE 9
- // following action should trigger generatting of SMR messages:
+ // following action should trigger generating of SMR messages:
// 1) 192.0.4.5/32
// 2) 192.0.2.5/32
// 3) 192.0.5.5/32
- // 4) 192.0.1.1/32
+ // 4) 192.0.1.5/32
+ // 5) 192.0.1.1/32
multiSiteScenario.deleteNorthMappingNegative(SITE_C);
- sleepForSeconds(2);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_D5.getHost(5), SITE_D4.getHost(5),
- SITE_B.getHost(5),
- SITE_A.getHost(1));
+ SITE_B.getHost(5), SITE_A.getHost(1), SITE_A.getHost(5));
multiSiteScenario.assertPingWorks(SITE_A, 5, SITE_B, 4);
multiSiteScenario.assertPingWorks(SITE_B, 5, SITE_C, 4);
multiSiteScenario.assertPingWorks(SITE_A, 5, SITE_C, 4);
final SocketReader socketReader = SocketReader.startReadingInStandaloneThread(socket);
mapService.setLookupPolicy(IMappingService.LookupPolicy.NB_AND_SB);
- mapService.setMappingOverwrite(false);
+ mapService.setMappingMerge(true);
//TEST CASE 1
multiSiteScenario.storeSouthboundMappings(true, SITE_A_SB, SITE_B_SB, SITE_C_WP_100_1_SB, SITE_D_WP_100_1_SB,
multiSiteScenario.storeNorthMappingIpPrefix(SITE_A_SB);
multiSiteScenario.storeNorthMappingIpPrefix(SITE_B_SB);
multiSiteScenario.storeNorthMappingIpPrefix(SITE_C_WP_50_2_SB, SITE_D_WP_50_2_SB);
- sleepForSeconds(2);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.assertPingWorks(SITE_A_SB, 5, SITE_C_WP_50_2_SB, 4, SITE_D_WP_50_2_SB);
multiSiteScenario.assertPingWorks(SITE_B_SB, 5, SITE_C_WP_50_2_SB, 4, SITE_D_WP_50_2_SB);
//TEST CASE 2
- // following action should trigger generatting of SMR messages:
+ // following action should trigger generating of SMR messages:
// 1) 192.0.2.5/32
// 2) 192.0.1.5/32
multiSiteScenario.storeNorthMappingSrcDst(SITE_A_SB, SITE_C_WP_50_2_SB, SITE_D_WP_50_2_SB);
- sleepForSeconds(2);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B_SB.getHost(5), SITE_A_SB.getHost(5));
- // following action should trigger generatting of SMR messages:
+ // following action should trigger generating of SMR messages:
// 1) 192.0.2.5/32
// 2) 192.0.1.5/32
multiSiteScenario.storeNorthMappingNegative(SITE_C_SB, Action.Drop);
- sleepForSeconds(2);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B_SB.getHost(5), SITE_A_SB.getHost(5));
multiSiteScenario.assertPingWorks(SITE_A_SB, 5, SITE_C_WP_50_2_SB, 4, SITE_D_WP_50_2_SB);
//TEST CASE 3
- // following action should trigger generatting of SMR messages:
+ // following action should trigger generating of SMR messages:
// 1) 192.0.2.5/32
// 2) 192.0.1.5/32
multiSiteScenario.storeNorthMappingSrcDst(SITE_A_SB, SITE_C_WP_50_2_SB);
- sleepForSeconds(2);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B_SB.getHost(5), SITE_A_SB.getHost(5));
multiSiteScenario.assertPingWorks(SITE_A_SB, 5, SITE_C_WP_50_2_SB, 4);
//TEST CASE 4
multiSiteScenario.storeNorthMappingSrcDst(SITE_B_SB, SITE_C_WP_50_2_SB, SITE_D_WP_50_2_SB);
- sleepForSeconds(2);
- // following action should trigger generatting of SMR messages:
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
+ // following action should trigger generating of SMR messages:
// 1) 192.0.2.5/32
// 2) 192.0.1.5/32
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B_SB.getHost(5), SITE_A_SB.getHost(5));
//TEST CASE 5
multiSiteScenario.deleteSouthboundMappings(SITE_D_DELETE_SB);
- sleepForSeconds(2);
- // following action should trigger generatting of SMR messages:
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
+ // following action should trigger generating of SMR messages:
// 1) 192.0.2.5/32
// 2) 192.0.1.5/32
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B_SB.getHost(5), SITE_A_SB.getHost(5));
//TEST CASE 6
multiSiteScenario.deleteNorthMapingSrcDst(SITE_A_SB, SITE_C_WP_50_2_SB);
- sleepForSeconds(2);
- // following action should trigger generatting of SMR messages:
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
+ // following action should trigger generating of SMR messages:
// 1) 192.0.2.5/32
// 2) 192.0.1.5/32
multiSiteScenario.checkSMR(socketReader, SITE_C.getEidPrefix(), SITE_B_SB.getHost(5), SITE_A_SB.getHost(5));
multiSiteScenario.deleteNorthMapingSrcDst(SITE_B_SB, SITE_C_WP_50_2_SB);
- sleepForSeconds(2);
+ sleepForSeconds(MULTI_SITE_SLEEP_TIME);
multiSiteScenario.assertPingFails(SITE_B_SB, 5, SITE_C_WP_50_2_SB, 4);
socketReader.stopReading();
if (socket != null) {
socket.close();
}
- socket = initSocket(socket, 56756);
+ socket = MappingServiceIntegrationTestUtil.initSocket(56756);
sendPacket(mapRequestPacket);
- ByteBuffer readBuf = ByteBuffer.wrap(receivePacket().getData());
+ ByteBuffer readBuf = receivePacket();
MapReply reply = MapReplySerializer.getInstance().deserialize(readBuf);
assertEquals(4435248268955932168L, reply.getNonce().longValue());
MapReply mapReply = registerAddressAndQuery(eid);
assertEquals(4, mapReply.getNonce().longValue());
- assertEquals(locatorEid, mapReply.getMappingRecordItem().get(0).getMappingRecord().getLocatorRecord().get(0)
- .getRloc());
+ assertEquals(MappingServiceIntegrationTestUtil.DEFAULT_IPV4_RLOC,
+ mapReply.getMappingRecordItem().get(0).getMappingRecord().getLocatorRecord().get(0).getRloc());
}
mapService.addAuthenticationKey(eid, NULL_AUTH_KEY);
sleepForSeconds(1);
- MapRequestBuilder mapRequestBuilder = new MapRequestBuilder();
- mapRequestBuilder.setNonce((long) 4);
- mapRequestBuilder.setSourceEid(new SourceEidBuilder().setEid(LispAddressUtil.getNoAddressEid()).build());
- mapRequestBuilder.setEidItem(new ArrayList<EidItem>());
- mapRequestBuilder.getEidItem().add(new EidItemBuilder().setEid(eid).build());
- mapRequestBuilder.setItrRloc(new ArrayList<ItrRloc>());
- mapRequestBuilder.getItrRloc().add(
- new ItrRlocBuilder().setRloc(LispAddressUtil.asIpv4Rloc(ourAddress)).build());
- sendMapRequest(mapRequestBuilder.build());
+ MapRequest mapRequest = MappingServiceIntegrationTestUtil.getDefaultMapRequestBuilder(eid).build();
+ sendMapRequest(mapRequest);
MapReply mapReply = receiveMapReply();
assertEquals(4, mapReply.getNonce().longValue());
assertEquals(0, mapReply.getMappingRecordItem().get(0).getMappingRecord().getLocatorRecord().size());
- MapRegisterBuilder mapRegisterbuilder = new MapRegisterBuilder();
- mapRegisterbuilder.setWantMapNotify(true);
- mapRegisterbuilder.setNonce((long) 8);
- MappingRecordBuilder etlrBuilder = new MappingRecordBuilder();
- etlrBuilder.setEid(eid);
- etlrBuilder.setRecordTtl(254);
- LocatorRecordBuilder recordBuilder = new LocatorRecordBuilder();
- recordBuilder.setRloc(LispAddressUtil.asIpv4Rloc("4.3.2.1"));
- etlrBuilder.setLocatorRecord(new ArrayList<LocatorRecord>());
- etlrBuilder.getLocatorRecord().add(recordBuilder.build());
- mapRegisterbuilder.setMappingRecordItem(new ArrayList<MappingRecordItem>());
- mapRegisterbuilder.getMappingRecordItem().add(
- new MappingRecordItemBuilder().setMappingRecord(etlrBuilder.build()).build());
- sendMapRegister(mapRegisterbuilder.build());
+ MapRegister mapRegister = MappingServiceIntegrationTestUtil.getDefaultMapRegisterBuilder(eid).build();
+ sendMapRegister(mapRegister);
MapNotify mapNotify = receiveMapNotify();
assertEquals(8, mapNotify.getNonce().longValue());
sleepForSeconds(1);
- sendMapRequest(mapRequestBuilder.build());
+ sendMapRequest(mapRequest);
mapReply = receiveMapReply();
assertEquals(4, mapReply.getNonce().longValue());
- assertEquals(recordBuilder.getRloc(), mapReply.getMappingRecordItem().get(0).getMappingRecord()
- .getLocatorRecord().get(0).getRloc());
+ assertEquals(MappingServiceIntegrationTestUtil.DEFAULT_IPV4_RLOC,
+ mapReply.getMappingRecordItem().get(0).getMappingRecord().getLocatorRecord().get(0).getRloc());
}
public void testMapRegisterOverwritesNoSubkey() throws SocketTimeoutException {
cleanUP();
- mapService.setMappingOverwrite(true);
+ mapService.setMappingMerge(false);
Eid eid = LispAddressUtil.asIpv4PrefixBinaryEid("1.2.3.4/32");
Rloc rloc1Value = LispAddressUtil.asIpv4Rloc("4.3.2.1");
Rloc rloc2Value = LispAddressUtil.asIpv4Rloc("4.3.2.2");
public void testMapRegisterDoesntOverwritesNoSubkey() throws SocketTimeoutException {
cleanUP();
- mapService.setMappingOverwrite(false);
+ mapService.setMappingMerge(true);
Eid eid = LispAddressUtil.asIpv4PrefixBinaryEid("1.2.3.4/32");
Rloc rloc1Value = LispAddressUtil.asIpv4Rloc("4.3.2.1");
Rloc rloc2Value = LispAddressUtil.asIpv4Rloc("4.3.2.2");
mapRegisterPacketWithoutNotify[mapRegisterPacketWithoutNotify.length - 1] += 1;
sendPacket(mapRegisterPacketWithoutNotify);
- ByteBuffer readBuf = ByteBuffer.wrap(receivePacket().getData());
- MapRequest smr = MapRequestSerializer.getInstance().deserialize(readBuf, null);
+ MapRequest smr = receiveMapRequest();
assertTrue(smr.isSmr());
Eid sourceEid = smr.getSourceEid().getEid();
assertTrue(LispAddressUtil.asIpv4Eid("153.16.254.1").equals(sourceEid));
private void registerAddress(Eid eid) throws SocketTimeoutException {
mapService.addAuthenticationKey(eid, NULL_AUTH_KEY);
sleepForSeconds(1);
- MapRegisterBuilder mapRegisterBuilder = new MapRegisterBuilder();
- mapRegisterBuilder.setWantMapNotify(true);
- mapRegisterBuilder.setKeyId((short) 0);
- mapRegisterBuilder.setAuthenticationData(new byte[0]);
- mapRegisterBuilder.setNonce((long) 8);
- mapRegisterBuilder.setProxyMapReply(false);
- MappingRecordBuilder etlrBuilder = new MappingRecordBuilder();
- etlrBuilder.setEid(eid);
- etlrBuilder.setRecordTtl(254);
- etlrBuilder.setAction(Action.NoAction);
- etlrBuilder.setAuthoritative(false);
- etlrBuilder.setMapVersion((short) 0);
- LocatorRecordBuilder recordBuilder = new LocatorRecordBuilder();
- recordBuilder.setLocalLocator(false);
- recordBuilder.setRlocProbed(false);
- recordBuilder.setRouted(true);
- recordBuilder.setMulticastPriority((short) 0);
- recordBuilder.setMulticastWeight((short) 0);
- recordBuilder.setPriority((short) 0);
- recordBuilder.setWeight((short) 0);
- recordBuilder.setRloc(locatorEid);
- etlrBuilder.setLocatorRecord(new ArrayList<LocatorRecord>());
- etlrBuilder.getLocatorRecord().add(recordBuilder.build());
- mapRegisterBuilder.setMappingRecordItem(new ArrayList<MappingRecordItem>());
- mapRegisterBuilder.getMappingRecordItem().add(
- new MappingRecordItemBuilder().setMappingRecord(etlrBuilder.build()).build());
- sendMapRegister(mapRegisterBuilder.build());
+ MapRegister mapRegister = MappingServiceIntegrationTestUtil.getDefaultMapRegisterBuilder(eid).build();
+ sendMapRegister(mapRegister);
MapNotify mapNotify = receiveMapNotify();
assertEquals(8, mapNotify.getNonce().longValue());
}
private MapReply registerAddressAndQuery(Eid eid) throws SocketTimeoutException {
mapService.addAuthenticationKey(eid, NULL_AUTH_KEY);
sleepForSeconds(1);
- MapRegisterBuilder mapRegisterBuilder = new MapRegisterBuilder();
- mapRegisterBuilder.setWantMapNotify(true);
- mapRegisterBuilder.setKeyId((short) 0);
- mapRegisterBuilder.setAuthenticationData(new byte[0]);
- mapRegisterBuilder.setNonce((long) 8);
- mapRegisterBuilder.setProxyMapReply(false);
- MappingRecordBuilder etlrBuilder = new MappingRecordBuilder();
- etlrBuilder.setEid(eid);
- etlrBuilder.setRecordTtl(254);
- etlrBuilder.setAction(Action.NoAction);
- etlrBuilder.setAuthoritative(false);
- etlrBuilder.setMapVersion((short) 0);
- LocatorRecordBuilder recordBuilder = new LocatorRecordBuilder();
- recordBuilder.setLocalLocator(false);
- recordBuilder.setRlocProbed(false);
- recordBuilder.setRouted(true);
- recordBuilder.setMulticastPriority((short) 0);
- recordBuilder.setMulticastWeight((short) 0);
- recordBuilder.setPriority((short) 0);
- recordBuilder.setWeight((short) 0);
- recordBuilder.setRloc(locatorEid);
- etlrBuilder.setLocatorRecord(new ArrayList<LocatorRecord>());
- etlrBuilder.getLocatorRecord().add(recordBuilder.build());
- mapRegisterBuilder.setMappingRecordItem(new ArrayList<MappingRecordItem>());
- mapRegisterBuilder.getMappingRecordItem().add(new MappingRecordItemBuilder().setMappingRecord(
- etlrBuilder.build()).build());
- sendMapRegister(mapRegisterBuilder.build());
+ MapRegister mapRegister = MappingServiceIntegrationTestUtil.getDefaultMapRegisterBuilder(eid).build();
+ LOG.trace("Sending Map-Register via socket: {}", mapRegister);
+ sendMapRegister(mapRegister);
MapNotify mapNotify = receiveMapNotify();
+ LOG.trace("Received Map-Notify via socket: {}", mapNotify);
assertEquals(8, mapNotify.getNonce().longValue());
// wait for the notifications to propagate
sleepForSeconds(1);
- MapRequestBuilder mapRequestBuilder = new MapRequestBuilder();
- mapRequestBuilder.setNonce((long) 4);
- mapRequestBuilder.setEidItem(new ArrayList<EidItem>());
- mapRequestBuilder.getEidItem().add(new EidItemBuilder().setEid(eid).build());
- mapRequestBuilder.setItrRloc(new ArrayList<ItrRloc>());
- mapRequestBuilder.setSourceEid(new SourceEidBuilder().setEid(LispAddressUtil.asIpv4Eid(ourAddress)).build());
- mapRequestBuilder.getItrRloc().add(
- new ItrRlocBuilder().setRloc(LispAddressUtil.asIpv4Rloc(ourAddress)).build());
- mapRequestBuilder.setAuthoritative(false);
- mapRequestBuilder.setMapDataPresent(false);
- mapRequestBuilder.setPitr(false);
- mapRequestBuilder.setProbe(false);
- mapRequestBuilder.setSmr(false);
- mapRequestBuilder.setSmrInvoked(false);
- sendMapRequest(mapRequestBuilder.build());
+ MapRequest mapRequest = MappingServiceIntegrationTestUtil.getDefaultMapRequestBuilder(eid).build();
+ sendMapRequest(mapRequest);
return receiveMapReply();
}
public void mapRequestMapRegisterAndMapRequestTestTimeout() throws SocketTimeoutException {
cleanUP();
+ ConfigIni.getInstance().setSmrRetryCount(0);
Eid eid = LispAddressUtil.asIpv4PrefixBinaryEid("1.2.3.4/32");
mapService.addAuthenticationKey(eid, NULL_AUTH_KEY);
sleepForSeconds(1);
- MapRequestBuilder mapRequestBuilder = new MapRequestBuilder();
- mapRequestBuilder.setNonce((long) 4);
- mapRequestBuilder.setSourceEid(new SourceEidBuilder().setEid(LispAddressUtil.getNoAddressEid()).build());
- mapRequestBuilder.setEidItem(new ArrayList<EidItem>());
- mapRequestBuilder.getEidItem().add(new EidItemBuilder().setEid(eid).build());
- mapRequestBuilder.setItrRloc(new ArrayList<ItrRloc>());
- mapRequestBuilder.getItrRloc().add(
- new ItrRlocBuilder().setRloc(LispAddressUtil.asIpv4Rloc(ourAddress)).build());
- sendMapRequest(mapRequestBuilder.build());
+ MapRequest mapRequest = MappingServiceIntegrationTestUtil.getDefaultMapRequestBuilder(eid).build();
+ sendMapRequest(mapRequest);
MapReply mapReply = receiveMapReply();
assertEquals(4, mapReply.getNonce().longValue());
assertEquals(0, mapReply.getMappingRecordItem().get(0).getMappingRecord().getLocatorRecord().size());
- MapRegisterBuilder mapRegisterbuilder = new MapRegisterBuilder();
- mapRegisterbuilder.setWantMapNotify(true);
- mapRegisterbuilder.setNonce((long) 8);
-
- MappingRecordBuilder etlrBuilder = new MappingRecordBuilder();
- etlrBuilder.setEid(eid);
- etlrBuilder.setRecordTtl(254);
-
- LocatorRecordBuilder recordBuilder = new LocatorRecordBuilder();
- recordBuilder.setRloc(LispAddressUtil.asIpv4Rloc("4.3.2.1"));
- etlrBuilder.setLocatorRecord(new ArrayList<LocatorRecord>());
- etlrBuilder.getLocatorRecord().add(recordBuilder.build());
- mapRegisterbuilder.setMappingRecordItem(new ArrayList<MappingRecordItem>());
- mapRegisterbuilder.getMappingRecordItem().add(
- new MappingRecordItemBuilder().setMappingRecord(etlrBuilder.build()).build());
-
- sendMapRegister(mapRegisterbuilder.build());
+ MapRegister mapRegister = MappingServiceIntegrationTestUtil.getDefaultMapRegisterBuilder(eid).build();
+ sendMapRegister(mapRegister);
MapNotify mapNotify = receiveMapNotify();
assertEquals(8, mapNotify.getNonce().longValue());
sleepForSeconds(1);
- sendMapRequest(mapRequestBuilder.build());
+ sendMapRequest(mapRequest);
mapReply = receiveMapReply();
assertEquals(4, mapReply.getNonce().longValue());
- assertEquals(recordBuilder.getRloc(), mapReply.getMappingRecordItem().get(0).getMappingRecord()
- .getLocatorRecord().get(0).getRloc());
+ assertEquals(MappingServiceIntegrationTestUtil.DEFAULT_IPV4_RLOC,
+ mapReply.getMappingRecordItem().get(0).getMappingRecord().getLocatorRecord().get(0).getRloc());
causeEntryToBeCleaned();
- sendMapRequest(mapRequestBuilder.build());
+ sendMapRequest(mapRequest);
mapReply = receiveMapReply();
assertEquals(0, mapReply.getMappingRecordItem().get(0).getMappingRecord().getLocatorRecord().size());
}
}
+ private void timedOutMappingRecord() {
+ cleanUP();
+ mapService.setMappingMerge(true);
+ // mapping expires after 1 second
+ ConfigIni.getInstance().setRegistrationValiditySb(1000L);
+
+ final Eid eid = LispAddressUtil.asIpv4PrefixBinaryEid("1.2.3.4/32", new InstanceIdType(10L));
+ final MappingRecord mappingRecord = MappingServiceIntegrationTestUtil.getDefaultMappingRecordBuilder(eid)
+ .setRecordTtl(1000).build();
+
+ mapService.addAuthenticationKey(eid, NULL_AUTH_KEY);
+ mapService.addMapping(MappingOrigin.Southbound, eid, MappingServiceIntegrationTestUtil.DEFAULT_SITE_ID,
+ new MappingData(mappingRecord, System.currentTimeMillis()));
+ sleepForSeconds(2);
+
+ MappingRecord resultRecord = (MappingRecord) mapService.getMapping(MappingOrigin.Southbound, eid);
+ assertNull(resultRecord);
+ }
+
private void testTTLAfterClean(MapRequest mapRequest) throws SocketTimeoutException {
MapReply mapReply;
sendMapRequest(mapRequest);
}
private MapRegister createMapRegister(Eid eid, Rloc rloc) {
- MapRegisterBuilder mapRegisterbuilder = new MapRegisterBuilder();
- mapRegisterbuilder.setWantMapNotify(true);
- mapRegisterbuilder.setNonce((long) 8);
- mapRegisterbuilder.setKeyId((short) 0);
- MappingRecordBuilder etlrBuilder = new MappingRecordBuilder();
- etlrBuilder.setEid(eid);
- etlrBuilder.setRecordTtl(254);
- etlrBuilder.setAuthoritative(false);
- etlrBuilder.setAction(Action.NoAction);
- LocatorRecordBuilder recordBuilder = new LocatorRecordBuilder();
- recordBuilder.setRloc(rloc);
- etlrBuilder.setLocatorRecord(new ArrayList<LocatorRecord>());
- etlrBuilder.getLocatorRecord().add(recordBuilder.build());
- mapRegisterbuilder.setMappingRecordItem(new ArrayList<MappingRecordItem>());
- mapRegisterbuilder.getMappingRecordItem().add(
- new MappingRecordItemBuilder().setMappingRecord(etlrBuilder.build()).build());
- MapRegister mapRegister = mapRegisterbuilder.build();
- return mapRegister;
+ return MappingServiceIntegrationTestUtil.getDefaultMapRegisterBuilder(eid, rloc).build();
}
private MapRegister createMapRegister(Eid eid) {
- return createMapRegister(eid, LispAddressUtil.asIpv4Rloc("4.3.2.1"));
+ return MappingServiceIntegrationTestUtil.getDefaultMapRegisterBuilder(eid).build();
}
private MapRequest createMapRequest(Eid eid) {
- MapRequestBuilder mapRequestBuilder = new MapRequestBuilder();
- mapRequestBuilder.setNonce((long) 4);
- mapRequestBuilder.setPitr(false);
- mapRequestBuilder.setSourceEid(new SourceEidBuilder().setEid(LispAddressUtil.getNoAddressEid()).build());
- mapRequestBuilder.setEidItem(new ArrayList<EidItem>());
- mapRequestBuilder.getEidItem().add(new EidItemBuilder().setEid(eid).build());
- mapRequestBuilder.setItrRloc(new ArrayList<ItrRloc>());
- mapRequestBuilder.getItrRloc().add(
- new ItrRlocBuilder().setRloc(LispAddressUtil.asIpv4Rloc(ourAddress)).build());
- MapRequest mr = mapRequestBuilder.build();
- return mr;
+ return MappingServiceIntegrationTestUtil.getDefaultMapRequestBuilder(eid).build();
}
public void testSimpleNonProxy() throws SocketTimeoutException, SocketException {
MapRequest mapRequest = createNonProxyMapRequest(eid, adLcaf);
sendMapRequest(mapRequest);
DatagramSocket nonProxySocket = new DatagramSocket(new InetSocketAddress(rloc, port));
- MapRequest receivedMapRequest = receiveMapRequest(nonProxySocket);
+ MapRequest receivedMapRequest = MappingServiceIntegrationTestUtil.receiveMapRequest(nonProxySocket);
assertEquals(mapRequest.getNonce(), receivedMapRequest.getNonce());
assertEquals(mapRequest.getSourceEid(), receivedMapRequest.getSourceEid());
assertEquals(mapRequest.getItrRloc(), receivedMapRequest.getItrRloc());
return mapRequest;
}
- private void assertMapNotifyReceived() throws SocketTimeoutException {
- receiveMapNotify();
- }
-
- private MapReply receiveMapReply() throws SocketTimeoutException {
- return MapReplySerializer.getInstance().deserialize(ByteBuffer.wrap(receivePacket().getData()));
- }
-
- private MapRequest receiveMapRequest(DatagramSocket datagramSocket) throws SocketTimeoutException {
- return MapRequestSerializer.getInstance().deserialize(ByteBuffer.wrap(receivePacket(
- datagramSocket, 30000).getData()), null);
- }
-
- private MapNotify receiveMapNotify() throws SocketTimeoutException {
- return MapNotifySerializer.getInstance().deserialize(ByteBuffer.wrap(receivePacket().getData()));
- }
-
private void sendMapRequest(MapRequest mapRequest) {
sendMapRequest(mapRequest, LispMessage.PORT_NUM);
}
}
private void sendPacket(byte[] bytesToSend, int port) {
- try {
- DatagramPacket packet = new DatagramPacket(bytesToSend, bytesToSend.length);
- initPacketAddress(packet, port);
- LOG.trace("Sending packet to LispPlugin on socket, port {}", port);
- socket.send(packet);
- } catch (Throwable t) {
- fail();
- }
+ MappingServiceIntegrationTestUtil.sendPacket(socket, bytesToSend, port);
+ }
+
+ private ByteBuffer receivePacket() throws SocketTimeoutException {
+ return MappingServiceIntegrationTestUtil.receivePacket(socket); }
+
+ private ByteBuffer receivePacket(int timeout) throws SocketTimeoutException {
+ return MappingServiceIntegrationTestUtil.receivePacket(socket, timeout);
}
- private DatagramPacket receivePacket() throws SocketTimeoutException {
- return receivePacket(6000);
+ private void assertMapNotifyReceived() throws SocketTimeoutException {
+ MappingServiceIntegrationTestUtil.receiveMapNotify(socket);
}
- private DatagramPacket receivePacket(int timeout) throws SocketTimeoutException {
- return receivePacket(socket, timeout);
+ private MapRequest receiveMapRequest() throws SocketTimeoutException {
+ return MappingServiceIntegrationTestUtil.receiveMapRequest(socket);
}
- private DatagramPacket receivePacket(DatagramSocket receivedSocket, int timeout) throws SocketTimeoutException {
- try {
- byte[] buffer = new byte[4096];
- DatagramPacket receivePacket = new DatagramPacket(buffer, buffer.length);
- LOG.trace("Waiting for packet from socket...");
- receivedSocket.setSoTimeout(timeout);
- receivedSocket.receive(receivePacket);
- LOG.trace("Received packet from socket!");
- return receivePacket;
- } catch (SocketTimeoutException ste) {
- throw ste;
- } catch (Throwable t) {
- fail();
- return null;
- }
+ private MapReply receiveMapReply() throws SocketTimeoutException {
+ return MappingServiceIntegrationTestUtil.receiveMapReply(socket);
+ }
+
+ private MapNotify receiveMapNotify() throws SocketTimeoutException {
+ return MappingServiceIntegrationTestUtil.receiveMapNotify(socket);
}
private void sleepForSeconds(int seconds) {
}
}
- private void initPacketAddress(DatagramPacket packet, int port) throws UnknownHostException {
- packet.setAddress(InetAddress.getByName(lispBindAddress));
- packet.setPort(port);
- }
-
- private DatagramSocket initSocket(DatagramSocket socket, int port) {
- for (int i=0; i < NUM_OF_ATTEMPTS_TO_CREATE_SOCKET; i++) {
- try {
- return new DatagramSocket(new InetSocketAddress(ourAddress, port));
- } catch (SocketException e) {
- LOG.error("Can't initialize socket for {}", ourAddress, e);
- }
- }
- fail();
- return null;
- }
-
private byte[] extractWSUdpByteArray(String wiresharkHex) {
final int HEADER_LEN = 42;
byte[] res = new byte[1000];
after();
mapService.cleanCachedMappings();
configLispPlugin.shouldListenOnXtrPort(false);
- socket = initSocket(socket, LispMessage.PORT_NUM);
+ socket = MappingServiceIntegrationTestUtil.initSocket(LispMessage.PORT_NUM);
}
private void restartSocket() {
after();
- socket = initSocket(socket, LispMessage.PORT_NUM);
+ socket = MappingServiceIntegrationTestUtil.initSocket(LispMessage.PORT_NUM);
}
}