diff options
Diffstat (limited to 'lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write')
15 files changed, 178 insertions, 173 deletions
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java index 91087a879..bf19ae581 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizerTest.java @@ -34,8 +34,8 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.lisp.context.util.AdjacenciesMappingContext; import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.hc2vpp.lisp.util.EidMappingContextHelper; -import io.fd.vpp.jvpp.core.dto.LispAddDelAdjacency; -import io.fd.vpp.jvpp.core.dto.LispAddDelAdjacencyReply; +import io.fd.vpp.jvpp.core.dto.OneAddDelAdjacency; +import io.fd.vpp.jvpp.core.dto.OneAddDelAdjacencyReply; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -67,7 +67,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class AdjacencyCustomizerTest extends WriterCustomizerTest implements EidMappingContextHelper { @Captor - private ArgumentCaptor<LispAddDelAdjacency> requestCaptor; + private ArgumentCaptor<OneAddDelAdjacency> requestCaptor; private EidMappingContext localMappingContext; @@ -126,7 +126,7 @@ public class AdjacencyCustomizerTest extends WriterCustomizerTest implements Eid .setAddressType(Ipv4Afi.class) .setAddress(new Ipv4Builder().setIpv4(ADDRESS_THREE).build()).build()).build(); - when(api.lispAddDelAdjacency(any())).thenReturn(future(new LispAddDelAdjacencyReply())); + when(api.oneAddDelAdjacency(any())).thenReturn(future(new OneAddDelAdjacencyReply())); } @Test @@ -134,7 +134,7 @@ public class AdjacencyCustomizerTest extends WriterCustomizerTest implements Eid try { customizer.writeCurrentAttributes(emptyId, emptyData, writeContext); } catch (NullPointerException e) { - verify(api, times(0)).lispAddDelAdjacency(any()); + verify(api, times(0)).oneAddDelAdjacency(any()); return; } @@ -146,7 +146,7 @@ public class AdjacencyCustomizerTest extends WriterCustomizerTest implements Eid try { customizer.writeCurrentAttributes(emptyId, invalidData, writeContext); } catch (NullPointerException e) { - verify(api, times(0)).lispAddDelAdjacency(any()); + verify(api, times(0)).oneAddDelAdjacency(any()); return; } @@ -159,7 +159,7 @@ public class AdjacencyCustomizerTest extends WriterCustomizerTest implements Eid defineEidMapping(mappingContext, LOCAL_EID_ONE, new MappingId("local-eid-one"), "local-mapping-context"); defineEidMapping(mappingContext, REMOTE_EID_ONE, new MappingId("remote-eid-one"), "remote-mapping-context"); customizer.writeCurrentAttributes(validId, validData, writeContext); - verify(api, times(1)).lispAddDelAdjacency(requestCaptor.capture()); + verify(api, times(1)).oneAddDelAdjacency(requestCaptor.capture()); verifyRequest(requestCaptor.getValue(), 1, new byte[]{-64, -88, 2, 1}, 32, new byte[]{-64, -88, 2, 3}, 32, IPV4.getValue(), 2); verify(adjacenciesMappingContext, times(1)) @@ -173,7 +173,7 @@ public class AdjacencyCustomizerTest extends WriterCustomizerTest implements Eid try { customizer.writeCurrentAttributes(validId, validData, writeContext); } catch (IllegalStateException e) { - verify(api, times(0)).lispAddDelAdjacency(any()); + verify(api, times(0)).oneAddDelAdjacency(any()); return; } @@ -188,7 +188,7 @@ public class AdjacencyCustomizerTest extends WriterCustomizerTest implements Eid try { customizer.writeCurrentAttributes(validId, validData, writeContext); } catch (IllegalStateException e) { - verify(api, times(0)).lispAddDelAdjacency(any()); + verify(api, times(0)).oneAddDelAdjacency(any()); return; } @@ -205,7 +205,7 @@ public class AdjacencyCustomizerTest extends WriterCustomizerTest implements Eid try { customizer.deleteCurrentAttributes(emptyId, emptyData, writeContext); } catch (NullPointerException e) { - verify(api, times(0)).lispAddDelAdjacency(any()); + verify(api, times(0)).oneAddDelAdjacency(any()); return; } @@ -220,13 +220,13 @@ public class AdjacencyCustomizerTest extends WriterCustomizerTest implements Eid @Test public void deleteCurrentAttributes() throws Exception { customizer.deleteCurrentAttributes(validId, validData, writeContext); - verify(api, times(1)).lispAddDelAdjacency(requestCaptor.capture()); + verify(api, times(1)).oneAddDelAdjacency(requestCaptor.capture()); verifyRequest(requestCaptor.getValue(), 0, new byte[]{-64, -88, 2, 1}, 32, new byte[]{-64, -88, 2, 3}, 32, IPV4.getValue(), 2); verify(adjacenciesMappingContext, times(1)).removeForIndex("adj-one", mappingContext); } - private static void verifyRequest(final LispAddDelAdjacency request, final int isAdd, final byte[] leid, + private static void verifyRequest(final OneAddDelAdjacency request, final int isAdd, final byte[] leid, final int leidLen, final byte[] reid, final int reidLen, final int eidType, final int vni) { diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java index cc76905ea..1fa689f60 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizerTest.java @@ -28,8 +28,8 @@ import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispAddDelLocator; -import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorReply; +import io.fd.vpp.jvpp.core.dto.OneAddDelLocator; +import io.fd.vpp.jvpp.core.dto.OneAddDelLocatorReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; @@ -46,7 +46,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class InterfaceCustomizerTest extends WriterCustomizerTest implements ByteDataTranslator { @Captor - private ArgumentCaptor<LispAddDelLocator> intfCaptor; + private ArgumentCaptor<OneAddDelLocator> intfCaptor; private InstanceIdentifier<Interface> id; private Interface intf; @@ -72,7 +72,7 @@ public class InterfaceCustomizerTest extends WriterCustomizerTest implements Byt customizer = new InterfaceCustomizer(api, new NamingContext("PREFIX", ifcCtxName)); - when(api.lispAddDelLocator(any(LispAddDelLocator.class))).thenReturn(future(new LispAddDelLocatorReply())); + when(api.oneAddDelLocator(any(OneAddDelLocator.class))).thenReturn(future(new OneAddDelLocatorReply())); } @Test(expected = NullPointerException.class) @@ -102,9 +102,9 @@ public class InterfaceCustomizerTest extends WriterCustomizerTest implements Byt public void testWriteCurrentAttributes() throws WriteFailedException { customizer.writeCurrentAttributes(id, intf, writeContext); - verify(api, times(1)).lispAddDelLocator(intfCaptor.capture()); + verify(api, times(1)).oneAddDelLocator(intfCaptor.capture()); - LispAddDelLocator request = intfCaptor.getValue(); + OneAddDelLocator request = intfCaptor.getValue(); assertNotNull(request); assertEquals(1, request.isAdd); @@ -146,9 +146,9 @@ public class InterfaceCustomizerTest extends WriterCustomizerTest implements Byt public void testDeleteCurrentAttributes() throws WriteFailedException { customizer.deleteCurrentAttributes(id, intf, writeContext); - verify(api, times(1)).lispAddDelLocator(intfCaptor.capture()); + verify(api, times(1)).oneAddDelLocator(intfCaptor.capture()); - LispAddDelLocator request = intfCaptor.getValue(); + OneAddDelLocator request = intfCaptor.getValue(); assertNotNull(request); assertEquals(0, request.isAdd); diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java index e11ec4262..7fc691b6e 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizerTest.java @@ -29,8 +29,8 @@ import static org.mockito.MockitoAnnotations.initMocks; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; import io.fd.vpp.jvpp.VppCallbackException; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapRequestItrRlocs; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapRequestItrRlocsReply; +import io.fd.vpp.jvpp.core.dto.OneAddDelMapRequestItrRlocs; +import io.fd.vpp.jvpp.core.dto.OneAddDelMapRequestItrRlocsReply; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -48,7 +48,7 @@ public class ItrRemoteLocatorSetCustomizerTest extends LispWriterCustomizerTest private static final String VALID_NAME = "loc-set"; @Captor - private ArgumentCaptor<LispAddDelMapRequestItrRlocs> requestCaptor; + private ArgumentCaptor<OneAddDelMapRequestItrRlocs> requestCaptor; private ItrRemoteLocatorSetCustomizer customizer; private InstanceIdentifier<ItrRemoteLocatorSet> validId; @@ -119,25 +119,25 @@ public class ItrRemoteLocatorSetCustomizerTest extends LispWriterCustomizerTest } private void onWriteSuccess() { - when(api.lispAddDelMapRequestItrRlocs(any(LispAddDelMapRequestItrRlocs.class))) - .thenReturn(CompletableFuture.completedFuture(new LispAddDelMapRequestItrRlocsReply())); + when(api.oneAddDelMapRequestItrRlocs(any(OneAddDelMapRequestItrRlocs.class))) + .thenReturn(CompletableFuture.completedFuture(new OneAddDelMapRequestItrRlocsReply())); } private void onWriteThrow() { - when(api.lispAddDelMapRequestItrRlocs(any(LispAddDelMapRequestItrRlocs.class))) - .thenReturn(new CompletableFuture<LispAddDelMapRequestItrRlocsReply>() { + when(api.oneAddDelMapRequestItrRlocs(any(OneAddDelMapRequestItrRlocs.class))) + .thenReturn(new CompletableFuture<OneAddDelMapRequestItrRlocsReply>() { @Override - public LispAddDelMapRequestItrRlocsReply get(final long l, final TimeUnit timeUnit) + public OneAddDelMapRequestItrRlocsReply get(final long l, final TimeUnit timeUnit) throws InterruptedException, ExecutionException, TimeoutException { - throw new ExecutionException(new VppCallbackException("lispAddDelMapRequestItrRlocs", 1, -2)); + throw new ExecutionException(new VppCallbackException("oneAddDelMapRequestItrRlocs", 1, -2)); } }); } private void verifyWriteInvoked(final boolean add, final String name) { - verify(api, times(1)).lispAddDelMapRequestItrRlocs(requestCaptor.capture()); + verify(api, times(1)).oneAddDelMapRequestItrRlocs(requestCaptor.capture()); - final LispAddDelMapRequestItrRlocs request = requestCaptor.getValue(); + final OneAddDelMapRequestItrRlocs request = requestCaptor.getValue(); assertNotNull(request); assertEquals(booleanToByte(add), request.isAdd); assertEquals(name, toString(request.locatorSetName)); diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java index 733d1cd5b..b04029d0d 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispEnableDisable; -import io.fd.vpp.jvpp.core.dto.LispEnableDisableReply; +import io.fd.vpp.jvpp.core.dto.OneEnableDisable; +import io.fd.vpp.jvpp.core.dto.OneEnableDisableReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.Lisp; @@ -42,7 +42,7 @@ public class LispCustomizerTest extends WriterCustomizerTest { } private void whenlispEnableDisableThenSuccess() { - when(api.lispEnableDisable(any(LispEnableDisable.class))).thenReturn(future(new LispEnableDisableReply())); + when(api.oneEnableDisable(any(OneEnableDisable.class))).thenReturn(future(new OneEnableDisableReply())); } @Test(expected = NullPointerException.class) @@ -57,10 +57,10 @@ public class LispCustomizerTest extends WriterCustomizerTest { whenlispEnableDisableThenSuccess(); customizer.writeCurrentAttributes(null, intf, null); - ArgumentCaptor<LispEnableDisable> mappingCaptor = ArgumentCaptor.forClass(LispEnableDisable.class); - verify(api, times(1)).lispEnableDisable(mappingCaptor.capture()); + ArgumentCaptor<OneEnableDisable> mappingCaptor = ArgumentCaptor.forClass(OneEnableDisable.class); + verify(api, times(1)).oneEnableDisable(mappingCaptor.capture()); - LispEnableDisable request = mappingCaptor.getValue(); + OneEnableDisable request = mappingCaptor.getValue(); assertNotNull(request); assertEquals(1, request.isEn); @@ -78,10 +78,10 @@ public class LispCustomizerTest extends WriterCustomizerTest { whenlispEnableDisableThenSuccess(); customizer.updateCurrentAttributes(null, null, lisp, null); - ArgumentCaptor<LispEnableDisable> lispCaptor = ArgumentCaptor.forClass(LispEnableDisable.class); - verify(api, times(1)).lispEnableDisable(lispCaptor.capture()); + ArgumentCaptor<OneEnableDisable> lispCaptor = ArgumentCaptor.forClass(OneEnableDisable.class); + verify(api, times(1)).oneEnableDisable(lispCaptor.capture()); - LispEnableDisable request = lispCaptor.getValue(); + OneEnableDisable request = lispCaptor.getValue(); assertNotNull(request); assertEquals(1, request.isEn); @@ -99,10 +99,10 @@ public class LispCustomizerTest extends WriterCustomizerTest { whenlispEnableDisableThenSuccess(); customizer.deleteCurrentAttributes(null, lisp, null); - ArgumentCaptor<LispEnableDisable> lispCaptor = ArgumentCaptor.forClass(LispEnableDisable.class); - verify(api, times(1)).lispEnableDisable(lispCaptor.capture()); + ArgumentCaptor<OneEnableDisable> lispCaptor = ArgumentCaptor.forClass(OneEnableDisable.class); + verify(api, times(1)).oneEnableDisable(lispCaptor.capture()); - LispEnableDisable request = lispCaptor.getValue(); + OneEnableDisable request = lispCaptor.getValue(); assertNotNull(request); assertEquals(0, request.isEn); diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java index 8855f0564..f945415a1 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizerTest.java @@ -31,8 +31,8 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispAddDelLocalEid; -import io.fd.vpp.jvpp.core.dto.LispAddDelLocalEidReply; +import io.fd.vpp.jvpp.core.dto.OneAddDelLocalEid; +import io.fd.vpp.jvpp.core.dto.OneAddDelLocalEidReply; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.concurrent.ExecutionException; @@ -65,7 +65,7 @@ public class LocalMappingCustomizerTest extends WriterCustomizerTest implements @Mock private EidMappingContext eidMappingContext; @Captor - private ArgumentCaptor<LispAddDelLocalEid> mappingCaptor; + private ArgumentCaptor<OneAddDelLocalEid> mappingCaptor; private InstanceIdentifier<LocalMapping> id; private LocalMapping mapping; @@ -106,7 +106,7 @@ public class LocalMappingCustomizerTest extends WriterCustomizerTest implements customizer = new LocalMappingCustomizer(api, eidMappingContext); - when(api.lispAddDelLocalEid(any(LispAddDelLocalEid.class))).thenReturn(future(new LispAddDelLocalEidReply())); + when(api.oneAddDelLocalEid(any(OneAddDelLocalEid.class))).thenReturn(future(new OneAddDelLocalEidReply())); } @@ -138,9 +138,9 @@ public class LocalMappingCustomizerTest extends WriterCustomizerTest implements public void testWriteCurrentAttributes() throws WriteFailedException { customizer.writeCurrentAttributes(id, mapping, writeContext); - verify(api, times(1)).lispAddDelLocalEid(mappingCaptor.capture()); + verify(api, times(1)).oneAddDelLocalEid(mappingCaptor.capture()); - LispAddDelLocalEid request = mappingCaptor.getValue(); + OneAddDelLocalEid request = mappingCaptor.getValue(); assertNotNull(request); assertEquals("Locator", new String(request.locatorSetName)); @@ -155,9 +155,9 @@ public class LocalMappingCustomizerTest extends WriterCustomizerTest implements public void testWriteCurrentAttributesWithHmacKey() throws WriteFailedException { customizer.writeCurrentAttributes(id, mappingWithHmacKey, writeContext); - verify(api, times(1)).lispAddDelLocalEid(mappingCaptor.capture()); + verify(api, times(1)).oneAddDelLocalEid(mappingCaptor.capture()); - LispAddDelLocalEid request = mappingCaptor.getValue(); + OneAddDelLocalEid request = mappingCaptor.getValue(); assertNotNull(request); assertEquals("Locator", new String(request.locatorSetName)); @@ -180,9 +180,9 @@ public class LocalMappingCustomizerTest extends WriterCustomizerTest implements when(eidMappingContext.containsEid(any(), eq(mappingContext))).thenReturn(true); customizer.deleteCurrentAttributes(id, mapping, writeContext); - verify(api, times(1)).lispAddDelLocalEid(mappingCaptor.capture()); + verify(api, times(1)).oneAddDelLocalEid(mappingCaptor.capture()); - LispAddDelLocalEid request = mappingCaptor.getValue(); + OneAddDelLocalEid request = mappingCaptor.getValue(); assertNotNull(request); assertEquals("Locator", new String(request.locatorSetName)); @@ -198,9 +198,9 @@ public class LocalMappingCustomizerTest extends WriterCustomizerTest implements when(eidMappingContext.containsEid(any(), eq(mappingContext))).thenReturn(true); customizer.deleteCurrentAttributes(id, mappingWithHmacKey, writeContext); - verify(api, times(1)).lispAddDelLocalEid(mappingCaptor.capture()); + verify(api, times(1)).oneAddDelLocalEid(mappingCaptor.capture()); - LispAddDelLocalEid request = mappingCaptor.getValue(); + OneAddDelLocalEid request = mappingCaptor.getValue(); assertNotNull(request); assertEquals("Locator", new String(request.locatorSetName)); diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java index 50cba9dd5..00c9f3eff 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizerTest.java @@ -31,10 +31,10 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorSet; -import io.fd.vpp.jvpp.core.dto.LispAddDelLocatorSetReply; -import io.fd.vpp.jvpp.core.dto.LispLocatorSetDetails; -import io.fd.vpp.jvpp.core.dto.LispLocatorSetDetailsReplyDump; +import io.fd.vpp.jvpp.core.dto.OneAddDelLocatorSet; +import io.fd.vpp.jvpp.core.dto.OneAddDelLocatorSetReply; +import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetails; +import io.fd.vpp.jvpp.core.dto.OneLocatorSetDetailsReplyDump; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.concurrent.ExecutionException; @@ -99,22 +99,22 @@ public class LocatorSetCustomizerTest extends LispWriterCustomizerTest { InstanceIdentifier.create(LocatorSets.class).child(LocatorSet.class, new LocatorSetKey("Locator")); - ArgumentCaptor<LispAddDelLocatorSet> locatorSetCaptor = ArgumentCaptor.forClass(LispAddDelLocatorSet.class); + ArgumentCaptor<OneAddDelLocatorSet> locatorSetCaptor = ArgumentCaptor.forClass(OneAddDelLocatorSet.class); - when(api.lispAddDelLocatorSet(any(LispAddDelLocatorSet.class))) - .thenReturn(future(new LispAddDelLocatorSetReply())); + when(api.oneAddDelLocatorSet(any(OneAddDelLocatorSet.class))) + .thenReturn(future(new OneAddDelLocatorSetReply())); when(writeContext.readAfter(validId)).thenReturn(Optional.of(locatorSet)); - final LispLocatorSetDetailsReplyDump reply = new LispLocatorSetDetailsReplyDump(); - LispLocatorSetDetails details = new LispLocatorSetDetails(); + final OneLocatorSetDetailsReplyDump reply = new OneLocatorSetDetailsReplyDump(); + OneLocatorSetDetails details = new OneLocatorSetDetails(); details.lsName = "Locator".getBytes(StandardCharsets.UTF_8); - reply.lispLocatorSetDetails = ImmutableList.of(details); + reply.oneLocatorSetDetails = ImmutableList.of(details); customizer.writeCurrentAttributes(validId, locatorSet, writeContext); - verify(api, times(1)).lispAddDelLocatorSet(locatorSetCaptor.capture()); + verify(api, times(1)).oneAddDelLocatorSet(locatorSetCaptor.capture()); - LispAddDelLocatorSet request = locatorSetCaptor.getValue(); + OneAddDelLocatorSet request = locatorSetCaptor.getValue(); assertNotNull(request); assertEquals("Locator", new String(request.locatorSetName)); @@ -166,16 +166,16 @@ public class LocatorSetCustomizerTest extends LispWriterCustomizerTest { } private void verifySuccessfullDelete(final LocatorSet locatorSet) throws WriteFailedException { - ArgumentCaptor<LispAddDelLocatorSet> locatorSetCaptor = ArgumentCaptor.forClass(LispAddDelLocatorSet.class); + ArgumentCaptor<OneAddDelLocatorSet> locatorSetCaptor = ArgumentCaptor.forClass(OneAddDelLocatorSet.class); - when(api.lispAddDelLocatorSet(any(LispAddDelLocatorSet.class))) - .thenReturn(future(new LispAddDelLocatorSetReply())); + when(api.oneAddDelLocatorSet(any(OneAddDelLocatorSet.class))) + .thenReturn(future(new OneAddDelLocatorSetReply())); customizer.deleteCurrentAttributes(null, locatorSet, writeContext); - verify(api, times(1)).lispAddDelLocatorSet(locatorSetCaptor.capture()); + verify(api, times(1)).oneAddDelLocatorSet(locatorSetCaptor.capture()); - LispAddDelLocatorSet request = locatorSetCaptor.getValue(); + OneAddDelLocatorSet request = locatorSetCaptor.getValue(); assertNotNull(request); assertEquals("Locator", new String(request.locatorSetName)); @@ -187,15 +187,15 @@ public class LocatorSetCustomizerTest extends LispWriterCustomizerTest { when(writeContext.readAfter(EID_TABLE_ID)) .thenReturn(eidTableData()); - ArgumentCaptor<LispAddDelLocatorSet> locatorSetCaptor = ArgumentCaptor.forClass(LispAddDelLocatorSet.class); + ArgumentCaptor<OneAddDelLocatorSet> locatorSetCaptor = ArgumentCaptor.forClass(OneAddDelLocatorSet.class); - when(api.lispAddDelLocatorSet(any(LispAddDelLocatorSet.class))) - .thenReturn(future(new LispAddDelLocatorSetReply())); + when(api.oneAddDelLocatorSet(any(OneAddDelLocatorSet.class))) + .thenReturn(future(new OneAddDelLocatorSetReply())); try { customizer.deleteCurrentAttributes(null, LOCATOR_SET_TO_DELETE, writeContext); } catch (IllegalStateException e) { - verify(api, times(0)).lispAddDelLocatorSet(locatorSetCaptor.capture()); + verify(api, times(0)).oneAddDelLocatorSet(locatorSetCaptor.capture()); return; } fail("testDeleteReferenced should have failed"); diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java index 30ab07cb8..f4f3d2fb6 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispMapRegisterEnableDisable; -import io.fd.vpp.jvpp.core.dto.LispMapRegisterEnableDisableReply; +import io.fd.vpp.jvpp.core.dto.OneMapRegisterEnableDisable; +import io.fd.vpp.jvpp.core.dto.OneMapRegisterEnableDisableReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; @@ -43,7 +43,7 @@ public class MapRegisterCustomizerTest extends LispWriterCustomizerTest implemen private MapRegister disabledRegister; @Captor - private ArgumentCaptor<LispMapRegisterEnableDisable> requestCaptor; + private ArgumentCaptor<OneMapRegisterEnableDisable> requestCaptor; private InstanceIdentifier<MapRegister> EMPTY_ID = InstanceIdentifier.create(MapRegister.class); private MapRegister EMPTY_DATA = new MapRegisterBuilder().setEnabled(false).build(); @@ -60,8 +60,8 @@ public class MapRegisterCustomizerTest extends LispWriterCustomizerTest implemen .setEnabled(false) .build(); - when(api.lispMapRegisterEnableDisable(any(LispMapRegisterEnableDisable.class))) - .thenReturn(future(new LispMapRegisterEnableDisableReply())); + when(api.oneMapRegisterEnableDisable(any(OneMapRegisterEnableDisable.class))) + .thenReturn(future(new OneMapRegisterEnableDisableReply())); } @Test @@ -125,9 +125,9 @@ public class MapRegisterCustomizerTest extends LispWriterCustomizerTest implemen } private void verifyRequest(final boolean enabled) { - verify(api, times(1)).lispMapRegisterEnableDisable(requestCaptor.capture()); + verify(api, times(1)).oneMapRegisterEnableDisable(requestCaptor.capture()); - final LispMapRegisterEnableDisable request = requestCaptor.getValue(); + final OneMapRegisterEnableDisable request = requestCaptor.getValue(); assertEquals(booleanToByte(enabled), request.isEnabled); } }
\ No newline at end of file diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java index 66384a495..c43960e20 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizerTest.java @@ -27,8 +27,8 @@ import static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.l import static org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.MapRequestMode.SourceDestination; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispMapRequestMode; -import io.fd.vpp.jvpp.core.dto.LispMapRequestModeReply; +import io.fd.vpp.jvpp.core.dto.OneMapRequestMode; +import io.fd.vpp.jvpp.core.dto.OneMapRequestModeReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; @@ -44,7 +44,7 @@ public class MapRequestModeCustomizerTest extends LispWriterCustomizerTest { private MapRequestMode destinationOnlyMode; @Captor - private ArgumentCaptor<LispMapRequestMode> requestCaptor; + private ArgumentCaptor<OneMapRequestMode> requestCaptor; private InstanceIdentifier<MapRequestMode> EMPTY_ID = InstanceIdentifier.create(MapRequestMode.class); private MapRequestMode EMPTY_DATA = new MapRequestModeBuilder().build(); @@ -57,7 +57,7 @@ public class MapRequestModeCustomizerTest extends LispWriterCustomizerTest { destinationOnlyMode = new MapRequestModeBuilder() .setMode(DestinationOnly) .build(); - when(api.lispMapRequestMode(any(LispMapRequestMode.class))).thenReturn(future(new LispMapRequestModeReply())); + when(api.oneMapRequestMode(any(OneMapRequestMode.class))).thenReturn(future(new OneMapRequestModeReply())); } @Test @@ -103,9 +103,9 @@ public class MapRequestModeCustomizerTest extends LispWriterCustomizerTest { private void verifyModeRequest( final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.MapRequestMode mode) { - verify(api, times(1)).lispMapRequestMode(requestCaptor.capture()); + verify(api, times(1)).oneMapRequestMode(requestCaptor.capture()); - final LispMapRequestMode request = requestCaptor.getValue(); + final OneMapRequestMode request = requestCaptor.getValue(); assertEquals(mode.getIntValue(), request.mode); } }
\ No newline at end of file diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java index 76017a439..bc7703b20 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapResolver; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapResolverReply; +import io.fd.vpp.jvpp.core.dto.OneAddDelMapResolver; +import io.fd.vpp.jvpp.core.dto.OneAddDelMapResolverReply; import java.util.concurrent.ExecutionException; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -49,9 +49,9 @@ public class MapResolverCustomizerTest extends LispWriterCustomizerTest implemen customizer = new MapResolverCustomizer(api, lispStateCheckService); } - private void whenLispAddDelMapResolverThenSuccess() { - when(api.lispAddDelMapResolver(any(LispAddDelMapResolver.class))) - .thenReturn(future(new LispAddDelMapResolverReply())); + private void whenOneAddDelMapResolverThenSuccess() { + when(api.oneAddDelMapResolver(any(OneAddDelMapResolver.class))) + .thenReturn(future(new OneAddDelMapResolverReply())); } @Test(expected = NullPointerException.class) @@ -69,14 +69,14 @@ public class MapResolverCustomizerTest extends LispWriterCustomizerTest implemen Ipv4Address address = new Ipv4Address("192.168.2.1"); MapResolver resolver = new MapResolverBuilder().setIpAddress(new IpAddress(address)).build(); - whenLispAddDelMapResolverThenSuccess(); + whenOneAddDelMapResolverThenSuccess(); customizer.writeCurrentAttributes(null, resolver, null); - ArgumentCaptor<LispAddDelMapResolver> resolverCaptor = ArgumentCaptor.forClass(LispAddDelMapResolver.class); - verify(api, times(1)).lispAddDelMapResolver(resolverCaptor.capture()); + ArgumentCaptor<OneAddDelMapResolver> resolverCaptor = ArgumentCaptor.forClass(OneAddDelMapResolver.class); + verify(api, times(1)).oneAddDelMapResolver(resolverCaptor.capture()); - LispAddDelMapResolver request = resolverCaptor.getValue(); + OneAddDelMapResolver request = resolverCaptor.getValue(); assertEquals(1, request.isAdd); assertEquals("192.168.2.1", arrayToIpv4AddressNoZone(request.ipAddress).getValue()); } @@ -92,14 +92,14 @@ public class MapResolverCustomizerTest extends LispWriterCustomizerTest implemen Ipv4Address address = new Ipv4Address("192.168.2.1"); MapResolver resolver = new MapResolverBuilder().setIpAddress(new IpAddress(address)).build(); - whenLispAddDelMapResolverThenSuccess(); + whenOneAddDelMapResolverThenSuccess(); customizer.deleteCurrentAttributes(null, resolver, null); - ArgumentCaptor<LispAddDelMapResolver> resolverCaptor = ArgumentCaptor.forClass(LispAddDelMapResolver.class); - verify(api, times(1)).lispAddDelMapResolver(resolverCaptor.capture()); + ArgumentCaptor<OneAddDelMapResolver> resolverCaptor = ArgumentCaptor.forClass(OneAddDelMapResolver.class); + verify(api, times(1)).oneAddDelMapResolver(resolverCaptor.capture()); - LispAddDelMapResolver request = resolverCaptor.getValue(); + OneAddDelMapResolver request = resolverCaptor.getValue(); assertEquals(0, request.isAdd); assertEquals("192.168.2.1", arrayToIpv4AddressNoZone(request.ipAddress).getValue()); } diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java index a13905847..14ff2c58c 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizerTest.java @@ -27,8 +27,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapServer; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapServerReply; +import io.fd.vpp.jvpp.core.dto.OneAddDelMapServer; +import io.fd.vpp.jvpp.core.dto.OneAddDelMapServerReply; import java.util.Arrays; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -54,7 +54,7 @@ public class MapServerCustomizerTest extends LispWriterCustomizerTest implements private MapServer EMPTY_DATA = new MapServerBuilder().build(); @Captor - private ArgumentCaptor<LispAddDelMapServer> requestCaptor; + private ArgumentCaptor<OneAddDelMapServer> requestCaptor; @Override protected void setUpTest() throws Exception { @@ -62,7 +62,7 @@ public class MapServerCustomizerTest extends LispWriterCustomizerTest implements data = new MapServerBuilder() .setIpAddress(MAP_SERVER_KEY.getIpAddress()) .build(); - when(api.lispAddDelMapServer(any())).thenReturn(future(new LispAddDelMapServerReply())); + when(api.oneAddDelMapServer(any())).thenReturn(future(new OneAddDelMapServerReply())); } @Test @@ -79,7 +79,7 @@ public class MapServerCustomizerTest extends LispWriterCustomizerTest implements } catch (WriteFailedException e) { assertTrue(e instanceof WriteFailedException.UpdateFailedException); assertTrue(e.getCause() instanceof UnsupportedOperationException); - verify(api, times(0)).lispAddDelMapServer(any()); + verify(api, times(0)).oneAddDelMapServer(any()); } } @@ -114,9 +114,9 @@ public class MapServerCustomizerTest extends LispWriterCustomizerTest implements } private void verifyRequest(final boolean add) { - verify(api, times(1)).lispAddDelMapServer(requestCaptor.capture()); + verify(api, times(1)).oneAddDelMapServer(requestCaptor.capture()); - final LispAddDelMapServer request = requestCaptor.getValue(); + final OneAddDelMapServer request = requestCaptor.getValue(); assertEquals(booleanToByte(add), request.isAdd); assertEquals(0, request.isIpv6); diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java index 40660a727..f46d79547 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizerTest.java @@ -27,8 +27,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispUsePetr; -import io.fd.vpp.jvpp.core.dto.LispUsePetrReply; +import io.fd.vpp.jvpp.core.dto.OneUsePetr; +import io.fd.vpp.jvpp.core.dto.OneUsePetrReply; import java.util.Arrays; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -48,7 +48,7 @@ public class PetrCfgCustomizerTest extends LispWriterCustomizerTest { private PetrCfg disabledCfg; @Captor - private ArgumentCaptor<LispUsePetr> requestCaptor; + private ArgumentCaptor<OneUsePetr> requestCaptor; private InstanceIdentifier<PetrCfg> EMPTY_ID = InstanceIdentifier.create(PetrCfg.class); private PetrCfg EMPTY_DATA = new PetrCfgBuilder().build(); @@ -57,7 +57,7 @@ public class PetrCfgCustomizerTest extends LispWriterCustomizerTest { customizer = new PetrCfgCustomizer(api, lispStateCheckService); enabledCfg = new PetrCfgBuilder().setPetrAddress(new IpAddress(new Ipv4Address("192.168.2.1"))).build(); disabledCfg = new PetrCfgBuilder().build(); - when(api.lispUsePetr(any(LispUsePetr.class))).thenReturn(future(new LispUsePetrReply())); + when(api.oneUsePetr(any(OneUsePetr.class))).thenReturn(future(new OneUsePetrReply())); } @Test @@ -121,18 +121,18 @@ public class PetrCfgCustomizerTest extends LispWriterCustomizerTest { } private void verifyEnabledInvoked() { - verify(api, times(1)).lispUsePetr(requestCaptor.capture()); + verify(api, times(1)).oneUsePetr(requestCaptor.capture()); - final LispUsePetr cfg = requestCaptor.getValue(); + final OneUsePetr cfg = requestCaptor.getValue(); assertEquals(1, cfg.isIp4); assertTrue(Arrays.equals(new byte[]{-64, -88, 2, 1}, cfg.address)); assertEquals(1, cfg.isAdd); } private void verifyDisabledInvoked() { - verify(api, times(1)).lispUsePetr(requestCaptor.capture()); + verify(api, times(1)).oneUsePetr(requestCaptor.capture()); - final LispUsePetr cfg = requestCaptor.getValue(); + final OneUsePetr cfg = requestCaptor.getValue(); assertNull(cfg.address); assertEquals(0, cfg.isAdd); } diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java index ae1b145da..520b5ee72 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispPitrSetLocatorSet; -import io.fd.vpp.jvpp.core.dto.LispPitrSetLocatorSetReply; +import io.fd.vpp.jvpp.core.dto.OnePitrSetLocatorSet; +import io.fd.vpp.jvpp.core.dto.OnePitrSetLocatorSetReply; import java.util.concurrent.ExecutionException; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -48,7 +48,7 @@ public class PitrCfgCustomizerTest extends LispWriterCustomizerTest { } private void whenLispPitrSetLocatorSetThenSuccess() { - when(api.lispPitrSetLocatorSet(any(LispPitrSetLocatorSet.class))).thenReturn(future(new LispPitrSetLocatorSetReply())); + when(api.onePitrSetLocatorSet(any(OnePitrSetLocatorSet.class))).thenReturn(future(new OnePitrSetLocatorSetReply())); } @Test(expected = NullPointerException.class) @@ -68,10 +68,10 @@ public class PitrCfgCustomizerTest extends LispWriterCustomizerTest { whenLispPitrSetLocatorSetThenSuccess(); customizer.writeCurrentAttributes(null, cfg, null); - ArgumentCaptor<LispPitrSetLocatorSet> cfgCaptor = ArgumentCaptor.forClass(LispPitrSetLocatorSet.class); - verify(api, times(1)).lispPitrSetLocatorSet(cfgCaptor.capture()); + ArgumentCaptor<OnePitrSetLocatorSet> cfgCaptor = ArgumentCaptor.forClass(OnePitrSetLocatorSet.class); + verify(api, times(1)).onePitrSetLocatorSet(cfgCaptor.capture()); - LispPitrSetLocatorSet request = cfgCaptor.getValue(); + OnePitrSetLocatorSet request = cfgCaptor.getValue(); assertEquals(1, request.isAdd); assertEquals("Locator", new String(request.lsName)); } @@ -84,10 +84,10 @@ public class PitrCfgCustomizerTest extends LispWriterCustomizerTest { customizer.writeCurrentAttributes(null, cfg, null); - ArgumentCaptor<LispPitrSetLocatorSet> cfgCaptor = ArgumentCaptor.forClass(LispPitrSetLocatorSet.class); - verify(api, times(1)).lispPitrSetLocatorSet(cfgCaptor.capture()); + ArgumentCaptor<OnePitrSetLocatorSet> cfgCaptor = ArgumentCaptor.forClass(OnePitrSetLocatorSet.class); + verify(api, times(1)).onePitrSetLocatorSet(cfgCaptor.capture()); - LispPitrSetLocatorSet request = cfgCaptor.getValue(); + OnePitrSetLocatorSet request = cfgCaptor.getValue(); assertEquals(1, request.isAdd); assertEquals("Locator", new String(request.lsName)); } @@ -110,10 +110,10 @@ public class PitrCfgCustomizerTest extends LispWriterCustomizerTest { customizer.deleteCurrentAttributes(null, cfg, null); - ArgumentCaptor<LispPitrSetLocatorSet> cfgCaptor = ArgumentCaptor.forClass(LispPitrSetLocatorSet.class); - verify(api, times(1)).lispPitrSetLocatorSet(cfgCaptor.capture()); + ArgumentCaptor<OnePitrSetLocatorSet> cfgCaptor = ArgumentCaptor.forClass(OnePitrSetLocatorSet.class); + verify(api, times(1)).onePitrSetLocatorSet(cfgCaptor.capture()); - LispPitrSetLocatorSet request = cfgCaptor.getValue(); + OnePitrSetLocatorSet request = cfgCaptor.getValue(); assertEquals(0, request.isAdd); assertEquals("Locator", new String(request.lsName)); } diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java index 5130881ed..35cc87689 100755 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizerTest.java @@ -16,13 +16,28 @@ package io.fd.hc2vpp.lisp.translate.write; +import static org.hamcrest.Matchers.hasSize; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispAddDelRemoteMapping; -import io.fd.vpp.jvpp.core.dto.LispAddDelRemoteMappingReply; -import io.fd.vpp.jvpp.core.types.RemoteLocator; +import io.fd.vpp.jvpp.core.dto.OneAddDelRemoteMapping; +import io.fd.vpp.jvpp.core.dto.OneAddDelRemoteMappingReply; +import io.fd.vpp.jvpp.core.types.OneRemoteLocator; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; @@ -52,20 +67,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.lisp.feature.data.grouping.LispFeatureData; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.*; - public class RemoteMappingCustomizerTest extends WriterCustomizerTest implements Ipv4Translator { @Captor - private ArgumentCaptor<LispAddDelRemoteMapping> mappingCaptor; + private ArgumentCaptor<OneAddDelRemoteMapping> mappingCaptor; private MappingId mappingId; private RemoteMappingCustomizer customizer; @@ -130,24 +135,24 @@ public class RemoteMappingCustomizerTest extends WriterCustomizerTest implements customizer = new RemoteMappingCustomizer(api, remoteMappingContext); - when(api.lispAddDelRemoteMapping(any())).thenReturn(future(new LispAddDelRemoteMappingReply())); + when(api.oneAddDelRemoteMapping(any())).thenReturn(future(new OneAddDelRemoteMappingReply())); } @Test public void testWritePositiveMappingNoPrioNoWeight() throws WriteFailedException { customizer.writeCurrentAttributes(id, positiveMappingNoPrioNoWeight, writeContext); - verify(api, times(1)).lispAddDelRemoteMapping(mappingCaptor.capture()); + verify(api, times(1)).oneAddDelRemoteMapping(mappingCaptor.capture()); - final LispAddDelRemoteMapping request = mappingCaptor.getValue(); + final OneAddDelRemoteMapping request = mappingCaptor.getValue(); assertNotNull(request); assertEquals(1, request.isAdd); assertEquals("192.168.2.1", arrayToIpv4AddressNoZone(request.eid).getValue()); assertEquals(25, request.vni); - final List<RemoteLocator> remoteLocators = Arrays.stream(request.rlocs).collect(Collectors.toList()); - assertThat(remoteLocators, hasSize(1)); + final List<OneRemoteLocator> oneRemoteLocators = Arrays.stream(request.rlocs).collect(Collectors.toList()); + assertThat(oneRemoteLocators, hasSize(1)); - final RemoteLocator locator = remoteLocators.get(0); + final OneRemoteLocator locator = oneRemoteLocators.get(0); assertArrayEquals(new byte[]{-64, -88, 2, 2}, locator.addr); assertEquals(1, locator.isIp4); assertEquals(0, locator.priority); @@ -157,18 +162,18 @@ public class RemoteMappingCustomizerTest extends WriterCustomizerTest implements @Test public void testWritePositiveMappingPrioWeight() throws WriteFailedException { customizer.writeCurrentAttributes(id, positiveMappingPrioWeight, writeContext); - verify(api, times(1)).lispAddDelRemoteMapping(mappingCaptor.capture()); + verify(api, times(1)).oneAddDelRemoteMapping(mappingCaptor.capture()); - final LispAddDelRemoteMapping request = mappingCaptor.getValue(); + final OneAddDelRemoteMapping request = mappingCaptor.getValue(); assertNotNull(request); assertEquals(1, request.isAdd); assertEquals("192.168.2.1", arrayToIpv4AddressNoZone(request.eid).getValue()); assertEquals(25, request.vni); - final List<RemoteLocator> remoteLocators = Arrays.stream(request.rlocs).collect(Collectors.toList()); - assertThat(remoteLocators, hasSize(1)); + final List<OneRemoteLocator> oneRemoteLocators = Arrays.stream(request.rlocs).collect(Collectors.toList()); + assertThat(oneRemoteLocators, hasSize(1)); - final RemoteLocator locator = remoteLocators.get(0); + final OneRemoteLocator locator = oneRemoteLocators.get(0); assertArrayEquals(new byte[]{-64, -88, 2, 3}, locator.addr); assertEquals(1, locator.isIp4); assertEquals(2, locator.priority); @@ -189,9 +194,9 @@ public class RemoteMappingCustomizerTest extends WriterCustomizerTest implements public void testWriteCurrentAttributes() throws WriteFailedException { customizer.writeCurrentAttributes(id, negativeMapping, writeContext); - verify(api, times(1)).lispAddDelRemoteMapping(mappingCaptor.capture()); + verify(api, times(1)).oneAddDelRemoteMapping(mappingCaptor.capture()); - LispAddDelRemoteMapping request = mappingCaptor.getValue(); + OneAddDelRemoteMapping request = mappingCaptor.getValue(); assertNotNull(request); assertEquals(1, request.isAdd); @@ -214,9 +219,9 @@ public class RemoteMappingCustomizerTest extends WriterCustomizerTest implements when(remoteMappingContext.containsEid(any(), eq(mappingContext))).thenReturn(true); customizer.deleteCurrentAttributes(id, negativeMapping, writeContext); - verify(api, times(1)).lispAddDelRemoteMapping(mappingCaptor.capture()); + verify(api, times(1)).oneAddDelRemoteMapping(mappingCaptor.capture()); - LispAddDelRemoteMapping request = mappingCaptor.getValue(); + OneAddDelRemoteMapping request = mappingCaptor.getValue(); assertNotNull(request); assertEquals(0, request.isAdd); diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java index e2a6b3e9f..6ae8277e4 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizerTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispRlocProbeEnableDisable; -import io.fd.vpp.jvpp.core.dto.LispRlocProbeEnableDisableReply; +import io.fd.vpp.jvpp.core.dto.OneRlocProbeEnableDisable; +import io.fd.vpp.jvpp.core.dto.OneRlocProbeEnableDisableReply; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; @@ -43,7 +43,7 @@ public class RlocProbeCustomizerTest extends LispWriterCustomizerTest implements private RlocProbe disabledProbe; @Captor - private ArgumentCaptor<LispRlocProbeEnableDisable> requestCaptor; + private ArgumentCaptor<OneRlocProbeEnableDisable> requestCaptor; private InstanceIdentifier<RlocProbe> EMPTY_ID = InstanceIdentifier.create(RlocProbe.class); private RlocProbe EMPTY_DATA = new RlocProbeBuilder().build(); @@ -52,8 +52,8 @@ public class RlocProbeCustomizerTest extends LispWriterCustomizerTest implements customizer = new RlocProbeCustomizer(api, lispStateCheckService); enabledProbe = rlocProbe(true); disabledProbe = rlocProbe(false); - when(api.lispRlocProbeEnableDisable(any(LispRlocProbeEnableDisable.class))) - .thenReturn(future(new LispRlocProbeEnableDisableReply())); + when(api.oneRlocProbeEnableDisable(any(OneRlocProbeEnableDisable.class))) + .thenReturn(future(new OneRlocProbeEnableDisableReply())); } @Test @@ -121,8 +121,8 @@ public class RlocProbeCustomizerTest extends LispWriterCustomizerTest implements } private void verifyRequest(final boolean enabled) { - verify(api, times(1)).lispRlocProbeEnableDisable(requestCaptor.capture()); - final LispRlocProbeEnableDisable request = requestCaptor.getValue(); + verify(api, times(1)).oneRlocProbeEnableDisable(requestCaptor.capture()); + final OneRlocProbeEnableDisable request = requestCaptor.getValue(); assertEquals(booleanToByte(enabled), request.isEnabled); } }
\ No newline at end of file diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java index 50186cd2b..64fd742e0 100644 --- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriterTestCase.java @@ -24,22 +24,22 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; -import io.fd.vpp.jvpp.core.dto.LispEidTableAddDelMap; -import io.fd.vpp.jvpp.core.dto.LispEidTableAddDelMapReply; +import io.fd.vpp.jvpp.core.dto.OneEidTableAddDelMap; +import io.fd.vpp.jvpp.core.dto.OneEidTableAddDelMapReply; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mockito; public class SubtableWriterTestCase extends WriterCustomizerTest implements SubtableWriter { @Captor - protected ArgumentCaptor<LispEidTableAddDelMap> requestCaptor; + protected ArgumentCaptor<OneEidTableAddDelMap> requestCaptor; protected void verifyAddDelEidTableAddDelMapInvokedCorrectly(final int addDel, final int vni, final int tableId, final int isL2) { - verify(api, times(1)).lispEidTableAddDelMap(requestCaptor.capture()); + verify(api, times(1)).oneEidTableAddDelMap(requestCaptor.capture()); - final LispEidTableAddDelMap request = requestCaptor.getValue(); + final OneEidTableAddDelMap request = requestCaptor.getValue(); assertNotNull(request); assertEquals(addDel, request.isAdd); assertEquals(vni, request.vni); @@ -48,12 +48,12 @@ public class SubtableWriterTestCase extends WriterCustomizerTest implements Subt } protected void whenAddDelEidTableAddDelMapSuccess() { - when(api.lispEidTableAddDelMap(Mockito.any(LispEidTableAddDelMap.class))) - .thenReturn(future(new LispEidTableAddDelMapReply())); + when(api.oneEidTableAddDelMap(Mockito.any(OneEidTableAddDelMap.class))) + .thenReturn(future(new OneEidTableAddDelMapReply())); } protected void whenAddDelEidTableAddDelMapFail() { - when(api.lispEidTableAddDelMap(Mockito.any(LispEidTableAddDelMap.class))) + when(api.oneEidTableAddDelMap(Mockito.any(OneEidTableAddDelMap.class))) .thenReturn(failedFuture()); } } |