*/
package org.opendaylight.lispflowmapping.implementation.mdsal;
+import static org.junit.Assert.assertEquals;
+
import com.google.common.collect.Lists;
import java.util.List;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
-import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.lispflowmapping.implementation.util.MSNotificationInputUtil;
import org.opendaylight.lispflowmapping.interfaces.mapcache.IMappingSystem;
+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.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataObjectModification;
+import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
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.record.container.MappingRecordBuilder;
+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.mappingservice.rev150906.EidUri;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingChange;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingChanged;
+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.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.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifier;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
public class MappingDataListenerTest {
-
private static IMappingSystem iMappingSystemMock;
private static NotificationPublishService notificationPublishServiceMock;
mappingDataListener =
new MappingDataListener(dataBrokerMock, iMappingSystemMock, notificationPublishServiceMock);
- final InstanceIdentifier<Mapping> instanceIdentifierMock = Mockito.mock(InstanceIdentifier.class);
- final DataTreeIdentifier<Mapping> dataTreeIdentifier =
- new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, instanceIdentifierMock);
+ final DataTreeIdentifier<Mapping> dataTreeIdentifier = DataTreeIdentifier.of(
+ LogicalDatastoreType.CONFIGURATION,
+ InstanceIdentifier.create(MappingDatabase.class)
+ .child(VirtualNetworkIdentifier.class)
+ .child(Mapping.class));
change_del = Mockito.mock(DataTreeModification.class);
change_subtreeModified = Mockito.mock(DataTreeModification.class);
Mockito.when(change_subtreeModified.getRootNode()).thenReturn(mod_subtreeModified);
Mockito.when(change_write.getRootPath()).thenReturn(dataTreeIdentifier);
Mockito.when(change_write.getRootNode()).thenReturn(mod_write);
- Mockito.when(mod_del.getModificationType()).thenReturn(ModificationType.DELETE);
- Mockito.when(mod_subtreeModified.getModificationType()).thenReturn(ModificationType.SUBTREE_MODIFIED);
- Mockito.when(mod_write.getModificationType()).thenReturn(ModificationType.WRITE);
+ Mockito.when(mod_del.modificationType()).thenReturn(ModificationType.DELETE);
+ Mockito.when(mod_subtreeModified.modificationType()).thenReturn(ModificationType.SUBTREE_MODIFIED);
+ Mockito.when(mod_write.modificationType()).thenReturn(ModificationType.WRITE);
Mockito.when(iMappingSystemMock.isMaster()).thenReturn(true);
}
* Tests {@link MappingDataListener#onDataTreeChanged} method with DELETE modification type from northbound.
*/
@Test
- @SuppressWarnings("unchecked")
public void onDataTreeChangedTest_delete_NB() throws InterruptedException {
final List<DataTreeModification<Mapping>> changes = Lists.newArrayList(change_del);
- final MappingChanged mapChanged = MSNotificationInputUtil
- .toMappingChanged(MAPPING_EID_1_NB, MappingChange.Removed);
- Mockito.when(mod_del.getDataBefore()).thenReturn(MAPPING_EID_1_NB);
+ Mockito.when(mod_del.dataBefore()).thenReturn(MAPPING_EID_1_NB);
mappingDataListener.onDataTreeChanged(changes);
Mockito.verify(iMappingSystemMock).removeMapping(MappingOrigin.Northbound, IPV4_EID_1);
- Mockito.verify(notificationPublishServiceMock).putNotification(mapChanged);
}
/**
* Tests {@link MappingDataListener#onDataTreeChanged} method with DELETE modification type from southbound.
*/
@Test
- @SuppressWarnings("unchecked")
public void onDataTreeChangedTest_delete_SB() {
final List<DataTreeModification<Mapping>> changes = Lists.newArrayList(change_del);
- Mockito.when(mod_del.getDataBefore()).thenReturn(MAPPING_EID_1_SB);
+ Mockito.when(mod_del.dataBefore()).thenReturn(MAPPING_EID_1_SB);
mappingDataListener.onDataTreeChanged(changes);
//Mockito.verifyZeroInteractions(iMappingSystemMock);
* northbound.
*/
@Test
- @SuppressWarnings("unchecked")
+ @Ignore
public void onDataTreeChangedTest_subtreeModified_NB() throws InterruptedException {
final List<DataTreeModification<Mapping>> changes = Lists.newArrayList(change_subtreeModified);
- final MappingChanged mapChanged = MSNotificationInputUtil
- .toMappingChanged(MAPPING_EID_2_NB, MappingChange.Updated);
- Mockito.when(mod_subtreeModified.getDataAfter()).thenReturn(MAPPING_EID_2_NB);
+ final MappingChanged mapChanged = MSNotificationInputUtil.toMappingChanged(
+ MAPPING_EID_2_NB.getMappingRecord(), null, null, null, MappingChange.Updated);
+ Mockito.when(mod_subtreeModified.dataAfter()).thenReturn(MAPPING_EID_2_NB);
mappingDataListener.onDataTreeChanged(changes);
+ final ArgumentCaptor<MappingData> captor = ArgumentCaptor.forClass(MappingData.class);
Mockito.verify(iMappingSystemMock)
- .addMapping(MappingOrigin.Northbound, IPV4_EID_2, MAPPING_EID_2_NB.getMappingRecord(), false);
+ .addMapping(Mockito.eq(MappingOrigin.Northbound), Mockito.eq(IPV4_EID_2), captor.capture());
+ assertEquals(captor.getValue().getRecord(), MAPPING_EID_2_NB.getMappingRecord());
Mockito.verify(notificationPublishServiceMock).putNotification(mapChanged);
}
* southbound.
*/
@Test
- @SuppressWarnings("unchecked")
public void onDataTreeChangedTest_subtreeModified_SB() {
final List<DataTreeModification<Mapping>> changes = Lists.newArrayList(change_subtreeModified);
- Mockito.when(mod_subtreeModified.getDataAfter()).thenReturn(MAPPING_EID_2_SB);
+ Mockito.when(mod_subtreeModified.dataAfter()).thenReturn(MAPPING_EID_2_SB);
mappingDataListener.onDataTreeChanged(changes);
//Mockito.verifyZeroInteractions(iMappingSystemMock);
* Tests {@link MappingDataListener#onDataTreeChanged} method with WRITE modification type from northbound.
*/
@Test
- @SuppressWarnings("unchecked")
+ @Ignore
public void onDataTreeChangedTest_write_NB() throws InterruptedException {
final List<DataTreeModification<Mapping>> changes = Lists.newArrayList(change_write);
- final MappingChanged mapChanged = MSNotificationInputUtil
- .toMappingChanged(MAPPING_EID_3_NB, MappingChange.Created);
- Mockito.when(mod_write.getDataAfter()).thenReturn(MAPPING_EID_3_NB);
+ final MappingChanged mapChanged = MSNotificationInputUtil.toMappingChanged(
+ MAPPING_EID_3_NB.getMappingRecord(), null, null, null, MappingChange.Created);
+ Mockito.when(mod_write.dataAfter()).thenReturn(MAPPING_EID_3_NB);
mappingDataListener.onDataTreeChanged(changes);
+ final ArgumentCaptor<MappingData> captor = ArgumentCaptor.forClass(MappingData.class);
Mockito.verify(iMappingSystemMock)
- .addMapping(MappingOrigin.Northbound, IPV4_EID_3, MAPPING_EID_3_NB.getMappingRecord(), false);
+ .addMapping(Mockito.eq(MappingOrigin.Northbound), Mockito.eq(IPV4_EID_3), captor.capture());
+ assertEquals(captor.getValue().getRecord(), MAPPING_EID_3_NB.getMappingRecord());
Mockito.verify(notificationPublishServiceMock).putNotification(mapChanged);
}
* Tests {@link MappingDataListener#onDataTreeChanged} method with WRITE modification type from southbound.
*/
@Test
- @SuppressWarnings("unchecked")
public void onDataTreeChangedTest_write_SB() {
final List<DataTreeModification<Mapping>> changes = Lists.newArrayList(change_write);
- Mockito.when(mod_write.getDataAfter()).thenReturn(MAPPING_EID_3_SB);
+ Mockito.when(mod_write.dataAfter()).thenReturn(MAPPING_EID_3_SB);
mappingDataListener.onDataTreeChanged(changes);
//Mockito.verifyZeroInteractions(iMappingSystemMock);
* Tests {@link MappingDataListener#onDataTreeChanged} method with multiple changes.
*/
@Test
- @SuppressWarnings("unchecked")
+ @Ignore
public void onDataTreeChangedTest_multipleChanges() throws InterruptedException {
final List<DataTreeModification<Mapping>> changes =
Lists.newArrayList(change_del, change_subtreeModified, change_write);
- final MappingChanged mapChangedDel = MSNotificationInputUtil
- .toMappingChanged(MAPPING_EID_1_NB, MappingChange.Removed);
- final MappingChanged mapChangedSubtreeMod = MSNotificationInputUtil
- .toMappingChanged(MAPPING_EID_2_NB, MappingChange.Updated);
+ final MappingChanged mapChangedSubtreeMod = MSNotificationInputUtil.toMappingChanged(
+ MAPPING_EID_2_NB.getMappingRecord(), null, null, null, MappingChange.Updated);
- Mockito.when(mod_del.getDataBefore()).thenReturn(MAPPING_EID_1_NB);
- Mockito.when(mod_subtreeModified.getDataAfter()).thenReturn(MAPPING_EID_2_NB);
- Mockito.when(mod_write.getDataAfter()).thenReturn(MAPPING_EID_3_SB);
+ Mockito.when(mod_del.dataBefore()).thenReturn(MAPPING_EID_1_NB);
+ Mockito.when(mod_subtreeModified.dataAfter()).thenReturn(MAPPING_EID_2_NB);
+ Mockito.when(mod_write.dataAfter()).thenReturn(MAPPING_EID_3_SB);
mappingDataListener.onDataTreeChanged(changes);
+ final ArgumentCaptor<MappingData> captor = ArgumentCaptor.forClass(MappingData.class);
Mockito.verify(iMappingSystemMock).removeMapping(MappingOrigin.Northbound, IPV4_EID_1);
- Mockito.verify(notificationPublishServiceMock).putNotification(mapChangedDel);
Mockito.verify(iMappingSystemMock)
- .addMapping(MappingOrigin.Northbound, IPV4_EID_2, MAPPING_EID_2_NB.getMappingRecord(), false);
+ .addMapping(Mockito.eq(MappingOrigin.Northbound), Mockito.eq(IPV4_EID_2), captor.capture());
+ assertEquals(captor.getValue().getRecord(), MAPPING_EID_2_NB.getMappingRecord());
Mockito.verify(notificationPublishServiceMock).putNotification(mapChangedSubtreeMod);
//Mockito.verifyNoMoreInteractions(iMappingSystemMock);
Mockito.verifyNoMoreInteractions(notificationPublishServiceMock);
final List<DataTreeModification<Mapping>> changes = Lists.newArrayList(changeNoModType);
Mockito.when(changeNoModType.getRootNode()).thenReturn(modNoType);
- Mockito.when(modNoType.getModificationType()).thenReturn(null);
+ Mockito.when(modNoType.modificationType()).thenReturn(null);
mappingDataListener.onDataTreeChanged(changes);
Mockito.verifyZeroInteractions(notificationPublishServiceMock);
}
-
private static Mapping getDefaultMapping(Eid eid, MappingOrigin origin) {
final MappingRecord record = new MappingRecordBuilder().setEid(eid).build();
- return new MappingBuilder().setOrigin(origin).setMappingRecord(record).build();
+ return new MappingBuilder()
+ .withKey(new MappingKey(new EidUri(LispAddressStringifier.getURIString(eid)), origin))
+ .setOrigin(origin)
+ .setMappingRecord(record).build();
}
}
Code Review / lispflowmapping.git / blobdiff