<artifactId>mappingservice.dsbackend</artifactId>
<packaging>bundle</packaging>
- <name>Mapping Service datastore backend</name>
+ <name>Mapping Service DataStore BackEnd</name>
<dependencies>
<dependency>
<pluginManagement>
<plugins>
<plugin>
- <!-- Temporarily override the odlparent checkstyle configuration.
- We want to enforce some simple rules and add more as we clean up code -->
+ <!-- Enforce odlparent checkstyle -->
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <configLocation>checkstyle/java_rules.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- <excludes>org/opendaylight/yang/gen/**,**/config/yang/**</excludes>
- <failsOnError>true</failsOnError>
- <consoleOutput>true</consoleOutput>
+ <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.lispflowmapping</groupId>
- <artifactId>common.build.tools</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- </execution>
- </executions>
</plugin>
</plugins>
</pluginManagement>
*/
package org.opendaylight.lispflowmapping.dsbackend;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
import java.util.ArrayList;
import java.util.List;
-
import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-
/**
* Stores data coming from the mapping database RPCs into the MD-SAL datastore.
*
public void onSuccess(Void result) {
}
- public void onFailure(Throwable t) {
- LOG.error("Transaction failed:", t);
+ public void onFailure(Throwable throwable) {
+ LOG.error("Transaction failed:", throwable);
}
});
}
public void onSuccess(Void result) {
}
- public void onFailure(Throwable t) {
- LOG.error("Transaction failed:", t);
+ public void onFailure(Throwable throwable) {
+ LOG.error("Transaction failed:", throwable);
}
});
}
*/
package org.opendaylight.lispflowmapping.dsbackend;
+import com.google.common.base.Preconditions;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
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.InstanceId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.EidUri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.VniUri;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingDatabase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.VniUri;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.XtrIdUri;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKeyKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifierKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import com.google.common.base.Preconditions;
-
/**
* Utility class to create InstanceIdentifier path objects based on EID.
* Used for storing RPC data to the config datastore.
@Before
public void init() {
- DataBroker brokerMock = Mockito.mock(DataBroker.class);
- Logger logMock = Mockito.mock(Logger.class, "LOG");
+ final DataBroker brokerMock = Mockito.mock(DataBroker.class);
+ final Logger logMock = Mockito.mock(Logger.class, "LOG");
PowerMockito.mockStatic(LoggerFactory.class);
- PowerMockito.when(LoggerFactory.getLogger(DataStoreBackEnd.class)).
- thenReturn(logMock);
+ PowerMockito.when(LoggerFactory.getLogger(DataStoreBackEnd.class))
+ .thenReturn(logMock);
Mockito.when(logMock.isDebugEnabled()).thenReturn(true);
Mockito.when(brokerMock.createTransactionChain(Mockito.any(DataStoreBackEnd.class))).thenReturn(txChainMock);
dataStoreBackEnd = PowerMockito.spy(new DataStoreBackEnd(brokerMock));
Mockito.when(txChainMock.newWriteOnlyTransaction()).thenReturn(wTxMock);
- Mockito.when(wTxMock.submit()).
- thenReturn(Futures.<Void, TransactionCommitFailedException>immediateCheckedFuture(null));
+ Mockito.when(wTxMock.submit())
+ .thenReturn(Futures.<Void, TransactionCommitFailedException>immediateCheckedFuture(null));
}
/**
private static MapNotifyBuilder getDefaultMapNotifyBuilder(MapRegister mapRegister) {
final MapNotifyBuilder mapNotifyBuilder = new MapNotifyBuilder()
+ .setXtrSiteIdPresent(mapRegister.isXtrSiteIdPresent())
+ .setSiteId(mapRegister.getSiteId())
+ .setXtrId(mapRegister.getXtrId())
.setNonce(mapRegister.getNonce())
.setKeyId(mapRegister.getKeyId())
.setMergeEnabled(mapRegister.isMergeEnabled())
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.commons.lang3.BooleanUtils;
import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
}
ByteBuffer replyBuffer = ByteBuffer.allocate(size);
- replyBuffer.put((byte) (MessageType.MapNotify.getIntValue() << 4));
+ replyBuffer.put((byte) ((byte) (MessageType.MapNotify.getIntValue() << 4) |
+ ByteUtil.boolToBit(BooleanUtils.isTrue(mapNotify.isXtrSiteIdPresent()), Flags.XTRSITEID)));
replyBuffer.position(replyBuffer.position() + Length.RES);
replyBuffer.put(ByteUtil.boolToBit(BooleanUtils.isTrue(mapNotify.isMergeEnabled()), Flags.MERGE_ENABLED));
if (mapNotify.getMappingRecordItem() != null) {
builder.setNonce(mapRegister.getNonce());
builder.setKeyId(mapRegister.getKeyId());
builder.setMergeEnabled(mapRegister.isMergeEnabled());
+ builder.setXtrSiteIdPresent(mapRegister.isXtrSiteIdPresent());
+ if (mapRegister.isXtrSiteIdPresent()) {
+ builder.setXtrId(mapRegister.getXtrId());
+ builder.setSiteId(mapRegister.getSiteId());
+ }
byte[] authenticationData = mapRegister.getAuthenticationData();
if (authenticationData != null) {
<pluginManagement>
<plugins>
<plugin>
- <!-- Temporarily override the odlparent checkstyle configuration.
- We want to enforce some simple rules and add more as we clean up code -->
+ <!-- Enforce odlparent checkstyle -->
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <configLocation>checkstyle/java_rules.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- <excludes>org/opendaylight/yang/gen/**,**/config/yang/**</excludes>
- <failsOnError>true</failsOnError>
- <consoleOutput>true</consoleOutput>
+ <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.lispflowmapping</groupId>
- <artifactId>common.build.tools</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- </execution>
- </executions>
</plugin>
</plugins>
</pluginManagement>
package org.opendaylight.lispflowmapping.mapcache;
import java.util.Date;
-
import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
import org.opendaylight.lispflowmapping.interfaces.dao.IRowVisitor;
import org.opendaylight.lispflowmapping.interfaces.dao.MappingEntry;
*/
package org.opendaylight.lispflowmapping.mapcache;
+import com.google.common.base.Preconditions;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-
/**
- * Utility class to implement merging of locator sets
+ * Utility class to implement merging of locator sets.
*
* @author Lorand Jakab
*
return newLocator;
}
- private static int compareLocators(LocatorRecord a, LocatorRecord b) {
- byte[] aIp = LispAddressUtil.ipAddressToByteArray(a.getRloc().getAddress());
- byte[] bIp = LispAddressUtil.ipAddressToByteArray(b.getRloc().getAddress());
- return LispAddressUtil.compareIpAddressByteArrays(aIp, bIp);
+ private static int compareLocators(LocatorRecord one, LocatorRecord two) {
+ byte[] oneIp = LispAddressUtil.ipAddressToByteArray(one.getRloc().getAddress());
+ byte[] twoIp = LispAddressUtil.ipAddressToByteArray(two.getRloc().getAddress());
+ return LispAddressUtil.compareIpAddressByteArrays(oneIp, twoIp);
}
private static void mergeLocatorRecords(MappingRecordBuilder mrb, MappingRecord newRecord) {
if (newLocatorList.size() != 0) {
List<LocatorRecord> mergedLocators = new ArrayList<LocatorRecord>();
- int mlIt = 0, lIt = 0;
- while (mlIt < newLocatorList.size() && lIt < locators.size()) {
- int cmp = compareLocators(locators.get(lIt), newLocatorList.get(mlIt));
+ int mlocIt = 0;
+ int locIt = 0;
+ while (mlocIt < newLocatorList.size() && locIt < locators.size()) {
+ int cmp = compareLocators(locators.get(locIt), newLocatorList.get(mlocIt));
if (cmp < 0) {
- mergedLocators.add(locators.get(lIt));
- lIt++;
+ mergedLocators.add(locators.get(locIt));
+ locIt++;
} else if (cmp > 0) {
- mergedLocators.add(newLocatorList.get(mlIt));
- mlIt++;
+ mergedLocators.add(newLocatorList.get(mlocIt));
+ mlocIt++;
} else {
// when a locator appears in both lists, keep the new (merged) one and skip the old
- mergedLocators.add(newLocatorList.get(mlIt));
- mlIt++;
- lIt++;
+ mergedLocators.add(newLocatorList.get(mlocIt));
+ mlocIt++;
+ locIt++;
}
}
- while (lIt < locators.size()) {
- mergedLocators.add(locators.get(lIt));
- lIt++;
+ while (locIt < locators.size()) {
+ mergedLocators.add(locators.get(locIt));
+ locIt++;
}
- while (mlIt < newLocatorList.size()) {
- mergedLocators.add(newLocatorList.get(mlIt));
- mlIt++;
+ while (mlocIt < newLocatorList.size()) {
+ mergedLocators.add(newLocatorList.get(mlocIt));
+ mlocIt++;
}
mrb.setLocatorRecord(mergedLocators);
}
import java.util.Date;
import java.util.Map;
-
import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
import org.opendaylight.lispflowmapping.interfaces.dao.IRowVisitor;
import org.opendaylight.lispflowmapping.interfaces.dao.MappingEntry;
ILispDAO srcDstDao = (ILispDAO) daoEntry.get(SubKeys.LCAF_SRCDST);
if (srcDstDao != null) {
Object mapping = getMappingLpmEid(srcEid, srcDstDao);
- if (mapping!= null) {
+ if (mapping != null) {
return mapping;
}
}
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
import org.opendaylight.lispflowmapping.interfaces.dao.IRowVisitor;
import org.opendaylight.lispflowmapping.interfaces.dao.MappingEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
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.mapping.record.container.MappingRecord;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
ILispDAO xtrIdTable = getXtrIdTable(eid, (ILispDAO) daoEntry.getValue().get(SubKeys.XTRID_RECORDS));
if (xtrIdTable != null) {
MappingRecord xtrIdRecord = (MappingRecord) xtrIdTable.getSpecific(xtrId, SubKeys.RECORD);
- if (xtrIdRecord.getTimestamp() != null &&
- MappingMergeUtil.timestampIsExpired(xtrIdRecord.getTimestamp())) {
+ if (xtrIdRecord.getTimestamp() != null
+ && MappingMergeUtil.timestampIsExpired(xtrIdRecord.getTimestamp())) {
xtrIdTable.removeSpecific(xtrId, SubKeys.RECORD);
return null;
} else {
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.atMost;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.Date;
-
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
import org.opendaylight.lispflowmapping.interfaces.dao.SubKeys;
import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
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.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.Ipv4Builder;
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.mapping.authkey.container
- .MappingAuthkey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container
- .MappingAuthkeyBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
public class FlatMapCacheTest {
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
-
import org.junit.Test;
import org.mockito.Mockito;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
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.locatorrecords.LocatorRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container
- .MappingRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
public class MappingMergeUtilTest {
.setRecordTtl(1)
.setSiteId(SITE_ID_2);
- MappingRecord result = MappingMergeUtil.mergeMappings
- (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
+ MappingRecord result = MappingMergeUtil.mergeMappings(
+ currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
assertEquals(mrb.build(),result);
}
.setSiteId(SITE_ID_2);
mrb.getLocatorRecord().add(currentLocatorRecord_1);
- MappingRecord result = MappingMergeUtil.mergeMappings
- (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
+ MappingRecord result = MappingMergeUtil.mergeMappings(
+ currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
assertEquals(mrb.build(),result);
}
.setSiteId(SITE_ID_2).setTimestamp(timestamp);
mrb.getLocatorRecord().add(newLocatorRecord_1);
- MappingRecord result = MappingMergeUtil.mergeMappings
- (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
+ MappingRecord result = MappingMergeUtil.mergeMappings(
+ currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
assertEquals(mrb.build(),result);
}
mrb.getLocatorRecord().add(currentLocatorRecord_1);
mrb.getLocatorRecord().add(newLocatorRecord_1);
- MappingRecord result = MappingMergeUtil.mergeMappings
- (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
+ MappingRecord result = MappingMergeUtil.mergeMappings(
+ currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
assertEquals(mrb.build(),result);
}
mrb.getLocatorRecord().add(currentLocatorRecord_3);
mrb.getLocatorRecord().add(newLocatorRecord_4);
- MappingRecord result = MappingMergeUtil.mergeMappings
- (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, timestamp);
+ MappingRecord result = MappingMergeUtil.mergeMappings(
+ currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, timestamp);
assertEquals(mrb.build(),result);
}
mrb.getLocatorRecord().add(newLocatorRecord_3);
mrb.getLocatorRecord().add(currentLocatorRecord_3);
- MappingRecord result = MappingMergeUtil.mergeMappings
- (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, timestamp);
+ MappingRecord result = MappingMergeUtil.mergeMappings(
+ currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, timestamp);
assertNotEquals(mrb.build(),result);
}
newMappingRecordBuilder.getLocatorRecord().add(newLocatorRecord_1);
// result
- MappingRecord result = MappingMergeUtil.mergeMappings
- (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, new Date(100L));
+ MappingRecord result = MappingMergeUtil.mergeMappings(
+ currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, new Date(100L));
assertEquals(XTR_ID_3, result.getXtrId());
assertEquals((Long) 100L, result.getTimestamp());
}
*/
@Test
public void mergeXtrIdMappingsTest_verifyExpiredMappings() {
- MappingRecord expiredMappingRecord_1 = getDefaultMappingRecordBuilder().setTimestamp(1L).build();
- MappingRecord expiredMappingRecord_2 = getDefaultMappingRecordBuilder()
+ MappingRecord expiredMappingRecord1 = getDefaultMappingRecordBuilder().setTimestamp(1L).build();
+ MappingRecord expiredMappingRecord2 = getDefaultMappingRecordBuilder()
.setXtrId(XTR_ID_2)
.setTimestamp(1L).build();
List<XtrId> expiredMappings = Lists.newArrayList();
List<Object> mappingRecords =
- Lists.newArrayList(expiredMappingRecord_1, expiredMappingRecord_2);
+ Lists.newArrayList(expiredMappingRecord1, expiredMappingRecord2);
assertNull(MappingMergeUtil.mergeXtrIdMappings(mappingRecords, expiredMappings, null));
assertEquals(2, expiredMappings.size());
import static org.mockito.Mockito.when;
import com.google.common.collect.Maps;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.Map;
-
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.opendaylight.lispflowmapping.lisp.util.SourceDestKeyHelper;
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.lisp.address.types.rev151105.InstanceIdType;
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.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.inet.types.rev130715.Ipv4Prefix;
-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.SourceDestKeyBuilder;
+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.MacBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKeyBuilder;
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.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.mapping.authkey
- .container.MappingAuthkey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey
- .container.MappingAuthkeyBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
public class MultiTableMapCacheTest {
import static org.junit.Assert.assertNull;
import com.google.common.collect.Lists;
-
+import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.Date;
import java.util.Map;
-import java.util.AbstractMap.SimpleImmutableEntry;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
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.mapping.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container
- .MappingRecordBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container
- .MappingAuthkey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container
- .MappingAuthkeyBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;