HONEYCOMB-230 : Refactor of Adjacencies api use

Change-Id: Ia83a5792c0e86fd5054d713038c2ed0a1c44a34e
Signed-off-by: Jan Srnicek <[email protected]>

diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizer.java
index a999bda..9cd2767 100755 (executable)
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizer.java
@@ -92,10 +92,10 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer
         LispAddDelAdjacency request = new LispAddDelAdjacency();
 
         request.isAdd = booleanToByte(add);
-        request.seid = getEidAsByteArray(data.getLocalEid());
-        request.seidLen = getPrefixLength(data.getLocalEid());
-        request.deid = getEidAsByteArray(data.getRemoteEid());
-        request.deidLen = getPrefixLength(data.getRemoteEid());
+        request.leid = getEidAsByteArray(data.getLocalEid());
+        request.leidLen = getPrefixLength(data.getLocalEid());
+        request.reid = getEidAsByteArray(data.getRemoteEid());
+        request.reidLen = getPrefixLength(data.getRemoteEid());
         request.eidType = (byte) localEidType.getValue();
         request.vni = vni;
 

diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizerTest.java
index 16942fe..b32b0bb 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizerTest.java
@@ -113,15 +113,16 @@ public class AdjacencyCustomizerTest extends WriterCustomizerTest {
                 32, IPV4.getValue(), 2);
     }
 
-    private static void verifyRequest(final LispAddDelAdjacency request, final int isAdd, final byte[] seid,
-                                      final int seidLen, final byte[] deid, final int deidLen, final int eidType,
+    private static void verifyRequest(final LispAddDelAdjacency request, final int isAdd, final byte[] leid,
+                                      final int leidLen, final byte[] reid, final int reidLen, final int eidType,
                                       final int vni) {
 
         assertNotNull(request);
         assertEquals(isAdd, request.isAdd);
-        assertArrayEquals(seid, request.seid);
-        assertEquals(seidLen, request.seidLen);
-        assertArrayEquals(deid, request.deid);
+        assertArrayEquals(leid, request.leid);
+        assertEquals(leidLen, request.leidLen);
+        assertArrayEquals(reid, request.reid);
+        assertEquals(reidLen, request.reidLen);
         assertEquals(eidType, request.eidType);
         assertEquals(vni, request.vni);