summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Srnicek <jsrnicek@cisco.com>2016-09-30 14:18:15 +0200
committerJan Srnicek <jsrnicek@cisco.com>2016-09-30 14:20:04 +0200
commit99f0fde138ac6543c04e8a816bd7fc7cd64247e5 (patch)
tree86b846f4ad3f0bd2d53ae858a16b6425bf18afbc
parent08ff39b3a156fbb93325ebc39f1ef697f137f034 (diff)
HONEYCOMB-230 : Refactor of Adjacencies api use
Change-Id: Ia83a5792c0e86fd5054d713038c2ed0a1c44a34e Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
-rwxr-xr-xlisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizer.java8
-rw-r--r--lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/AdjacencyCustomizerTest.java11
2 files changed, 10 insertions, 9 deletions
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 a999bda61..9cd276741 100755
--- 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 16942fe9d..b32b0bbe2 100644
--- 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);