import java.util.Date;
import java.util.EnumMap;
import java.util.List;
+import java.util.Set;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.mockito.junit.MockitoJUnitRunner;
import org.opendaylight.lispflowmapping.config.ConfigIni;
import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
import org.opendaylight.lispflowmapping.implementation.util.MappingMergeUtil;
import org.opendaylight.lispflowmapping.interfaces.mapcache.IMapCache;
import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
import org.opendaylight.lispflowmapping.lisp.type.MappingData;
+import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
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.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.ExplicitLocatorPathLcaf;
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.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.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.rloc.container.Rloc;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.EidUri;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
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.AuthenticationKeyBuilder;
+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.db.instance.Mapping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.MappingBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.MappingKey;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@PrepareForTest(MappingMergeUtil.class)
public class MappingSystemTest {
- private static ILispDAO daoMock = Mockito.mock(ILispDAO.class);
+ private static ILispDAO dao = new HashMapDb();
@Mock private static ILispMapCache smcMock;
@Mock private static IMapCache pmcMock;
@Mock private static IAuthKeyDb akdbMock;
@Mock private static DataStoreBackEnd dsbeMock;
@Mock private static NotificationPublishService npsMock;
@Mock private static EnumMap<MappingOrigin, IMapCache> tableMapMock;
- @InjectMocks private static MappingSystem mappingSystem = new MappingSystem(daoMock, false, npsMock, true);
+ @InjectMocks private static MappingSystem mappingSystem = new MappingSystem(dao, false, npsMock, true);
private static final String IPV4_SRC = "127.0.0.1";
private static final String IPV4_DST = "192.168.0.1";
private static final Eid EID_IPV4_1 = LispAddressUtil.asIpv4Eid(IPV4_STRING_1);
private static final Eid EID_IPV4_2 = LispAddressUtil.asIpv4Eid(IPV4_STRING_2);
private static final Eid EID_SERVICE_PATH = new EidBuilder().setAddress(getDefaultServicePath((short) 253)).build();
+ // with index out of bounds
private static final Eid EID_SERVICE_PATH_INDEX_OOB = new EidBuilder()
- .setAddress(getDefaultServicePath((short) 200)).build(); // with index out of bounds
+ .setAddress(getDefaultServicePath((short) 200)).build();
public static final SimpleAddress SIMPLE_ADDR_1 = new SimpleAddress(new IpAddress(new Ipv4Address(IPV4_STRING_1)));
public static final SimpleAddress SIMPLE_ADDR_2 = new SimpleAddress(new IpAddress(new Ipv4Address(IPV4_STRING_2)));
private static final Hop HOP_3 = new HopBuilder().setHopId("hop-id-3").setAddress(SIMPLE_ADDR_3).build();
private static final MappingAuthkeyBuilder MAPPING_AUTHKEY_BUILDER = new MappingAuthkeyBuilder()
- .setKeyType(1).setKeyString("pass-1");
+ .setKeyType(Uint16.ONE).setKeyString("pass-1");
private static final Rloc RLOC = LispAddressUtil.toRloc(new Ipv4Address(IPV4_STRING_2));
private static final ConfigIni CONFIG_INI = ConfigIni.getInstance();
private static final long REGISTRATION_VALIDITY = CONFIG_INI.getRegistrationValiditySb();
@Before
public void init() throws Exception {
- Mockito.when(daoMock.putTable(MappingOrigin.Southbound.toString())).thenReturn(Mockito.mock(HashMapDb.class));
- Mockito.when(daoMock.putTable(MappingOrigin.Northbound.toString())).thenReturn(Mockito.mock(HashMapDb.class));
-
Mockito.when(tableMapMock.get(MappingOrigin.Southbound)).thenReturn(smcMock);
Mockito.when(tableMapMock.get(MappingOrigin.Northbound)).thenReturn(pmcMock);
/**
* This method changes the lookup policy.
*/
- private static void setLookupPolicy(IMappingService.LookupPolicy policy) throws NoSuchFieldException,
+ private static void setLookupPolicy(final IMappingService.LookupPolicy policy) throws NoSuchFieldException,
IllegalAccessException {
final Field lookupPolicy = ConfigIni.class.getDeclaredField("lookupPolicy");
lookupPolicy.setAccessible(true);
final MappingData mappingData = getDefaultMappingData();
mappingData.setTimestamp(EXPIRED_DATE);
Mockito.when(pmcMock.getMapping(EID_IPV4_SRC, EID_IPV4_DST)).thenReturn(null);
- Mockito.when(smcMock.getMapping(EID_IPV4_DST, (XtrId) null)).thenReturn(mappingData);
+ Mockito.when(smcMock.getMapping(EID_IPV4_DST, (XtrId) null)).thenReturn(mappingData, null);
final Mapping mapping = new MappingBuilder()
.setEidUri(new EidUri("ipv4:" + IPV4_DST))
.setOrigin(MappingOrigin.Southbound)
- .setSiteId(Lists.newArrayList(SITE_ID))
+ .setSiteId(Set.of(SITE_ID))
.setMappingRecord(mappingData.getRecord()).build();
assertNull(mappingSystem.getMapping(EID_IPV4_SRC, EID_IPV4_DST));
public void getMappingTest_NbFirst_withServicePathDestinationAddress_multipleLocatorRecords() {
final MappingRecord mappingRecord = getDefaultMappingRecordBuilder()
.setLocatorRecord(Lists.newArrayList(
- getDefaultLocatorRecordBuilder().build(), // set two locators
+ // set two locators
+ getDefaultLocatorRecordBuilder().build(),
getDefaultLocatorRecordBuilder().build())).build();
final MappingData mappingData = getDefaultMappingData(mappingRecord);
Mockito.when(pmcMock.getMapping(EID_IPV4_SRC, EID_SERVICE_PATH)).thenReturn(mappingData);
public void getMappingTest_NbFirst_withServicePathDestinationAddress_singleIpv4LocatorRecord() {
final MappingRecord mappingRecord = getDefaultMappingRecordBuilder()
.setLocatorRecord(Lists.newArrayList(
- getDefaultLocatorRecordBuilder().build())).build(); // Ipv4 type Rloc
+ // Ipv4 type Rloc
+ getDefaultLocatorRecordBuilder().build())).build();
final MappingData mappingData = getDefaultMappingData(mappingRecord);
Mockito.when(pmcMock.getMapping(EID_IPV4_SRC, EID_SERVICE_PATH)).thenReturn(mappingData);
final MappingData mappingData = getDefaultMappingData(mappingRecord);
Mockito.when(pmcMock.getMapping(EID_IPV4_SRC, EID_SERVICE_PATH)).thenReturn(mappingData);
- final MappingData result = (MappingData) mappingSystem.getMapping(EID_IPV4_SRC, EID_SERVICE_PATH);
+ final MappingData result = mappingSystem.getMapping(EID_IPV4_SRC, EID_SERVICE_PATH);
final Ipv4Binary ipv4Result = (Ipv4Binary) result.getRecord().getLocatorRecord().get(0).getRloc().getAddress();
assertTrue(Arrays
.equals(InetAddress.getByName(IPV4_STRING_3).getAddress(), ipv4Result.getIpv4Binary().getValue()));
setLookupPolicy(IMappingService.LookupPolicy.NB_AND_SB);
final MappingRecord mappingRecord = getDefaultMappingRecordBuilder()
.setLocatorRecord(Lists.newArrayList(
- getDefaultLocatorRecordBuilder().build())).build(); // Ipv4 type Rloc
+ // Ipv4 type Rloc
+ getDefaultLocatorRecordBuilder().build())).build();
final MappingData mappingData = getDefaultMappingData(mappingRecord);
Mockito.when(pmcMock.getMapping(EID_IPV4_SRC, EID_SERVICE_PATH)).thenReturn(mappingData);
final MappingRecord mappingRecord = getDefaultMappingRecordBuilder()
.setLocatorRecord(Lists.newArrayList(
- getDefaultLocatorRecordBuilder().build())).build(); // Ipv4 type Rloc
+ // Ipv4 type Rloc
+ getDefaultLocatorRecordBuilder().build())).build();
MappingData nbMappingData = getDefaultMappingData(mappingRecord);
MappingData sbMappingData = getDefaultMappingData(mappingRecord);
sbMappingData.setTimestamp(EXPIRED_DATE);
Mockito.when(pmcMock.getMapping(EID_IPV4_SRC, EID_IPV4_DST)).thenReturn(nbMappingData);
- Mockito.when(smcMock.getMapping(EID_IPV4_DST, (XtrId) null)).thenReturn(sbMappingData);
+ Mockito.when(smcMock.getMapping(EID_IPV4_DST, (XtrId) null)).thenReturn(sbMappingData, null);
final Mapping mapping = new MappingBuilder()
.setEidUri(new EidUri("ipv4:" + IPV4_DST))
.setOrigin(MappingOrigin.Southbound)
- .setSiteId(Lists.newArrayList(SITE_ID))
+ .setSiteId(Set.of(SITE_ID))
.setMappingRecord(mappingRecord).build();
assertEquals(nbMappingData, mappingSystem.getMapping(EID_IPV4_SRC, EID_IPV4_DST));
*/
@Test
public void removeMappingTest_sb() throws NoSuchFieldException, IllegalAccessException {
- mappingSystem = new MappingSystem(daoMock, false, npsMock, false);
+ mappingSystem = new MappingSystem(dao, false, npsMock, false);
injectMocks();
Mockito.when(tableMapMock.get(MappingOrigin.Southbound)).thenReturn(smcMock);
@Test
public void restoreDaoFromDatastoreTest() {
final Mapping mapping_1 = new MappingBuilder()
+ .withKey(new MappingKey(new EidUri(LispAddressStringifier.getURIString(EID_IPV4_1)),
+ MappingOrigin.Northbound))
.setOrigin(MappingOrigin.Northbound)
.setMappingRecord(getDefaultMappingRecordBuilder()
.setEid(EID_IPV4_1).build()).build();
final Mapping mapping_2 = new MappingBuilder()
+ .withKey(new MappingKey(new EidUri(LispAddressStringifier.getURIString(EID_IPV4_2)),
+ MappingOrigin.Northbound))
.setOrigin(MappingOrigin.Northbound)
.setMappingRecord(getDefaultMappingRecordBuilder()
.setEid(EID_IPV4_2).build()).build();
final MappingAuthkey mappingAuthkey_1 = MAPPING_AUTHKEY_BUILDER.build();
final AuthenticationKey authenticationKey_1 = new AuthenticationKeyBuilder()
+ .withKey(new AuthenticationKeyKey(new EidUri("uri-1")))
.setMappingAuthkey(mappingAuthkey_1)
.setEid(EID_IPV4_1).build();
final MappingAuthkey mappingAuthkey_2 = MAPPING_AUTHKEY_BUILDER.setKeyString("pass-2").build();
final AuthenticationKey authenticationKey_2 = new AuthenticationKeyBuilder()
+ .withKey(new AuthenticationKeyKey(new EidUri("uri-2")))
.setMappingAuthkey(mappingAuthkey_2)
.setEid(EID_IPV4_2).build();
Mockito.verify(pmcMock).removeData(EID_IPV4_1, SubKeys.RECORD);
}
- /**
- * Tests {@link MappingSystem#cleanCaches} method.
- */
- @Test
- public void cleanCachesTest() {
- mappingSystem.cleanCaches();
- Mockito.verify(daoMock).removeAll();
- }
-
/**
* Following test are executed for coverage-increase purpose.
*/
Mockito.verify(smcMock).printMappings();
mappingSystem.destroy();
- mappingSystem = new MappingSystem(daoMock, true, npsMock, true);
+ mappingSystem = new MappingSystem(dao, true, npsMock, true);
mappingSystem.setDataStoreBackEnd(dsbeMock);
mappingSystem.setMappingMerge(false);
mappingSystem.setIterateMask(true);
.setEid(EID_IPV4_DST);
}
- private static ServicePath getDefaultServicePath(short index) {
+ private static ServicePath getDefaultServicePath(final short index) {
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.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();
return new ServicePathBuilder().setServicePath(servicePathBuilder
- .setServiceIndex(index)
- .setServicePathId(new ServicePathIdType(1L)).build())
+ .setServiceIndex(Uint8.valueOf(index))
+ .setServicePathId(new ServicePathIdType(Uint32.ONE)).build())
.build();
}
return new RlocBuilder()
.setAddress(explicitLocatorPath)
- .setAddressType(ExplicitLocatorPathLcaf.class).build();
+ .setAddressType(ExplicitLocatorPathLcaf.VALUE).build();
}
private static Rloc getIpPrefixTypeRloc() {
return new RlocBuilder()
.setAddress(address)
- .setAddressType(Ipv4PrefixAfi.class).build();
+ .setAddressType(Ipv4PrefixAfi.VALUE).build();
}
}
Code Review / lispflowmapping.git / blobdiff