summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-09-13 12:14:44 +0200
committerMarek Gradzki <mgradzki@cisco.com>2016-09-13 12:14:58 +0200
commitd4fbf9f664fedddea6698e8ccfa1ae44478f3642 (patch)
tree7386f9c0192673dba605d68763ca2d75c6ea5dc7
parent97d1e209f963d316ca17418038f177d17bdead72 (diff)
HONEYCOMB-211: workaround for issues introduced by VPP-376
Fix HC build issues introduced by https://gerrit.fd.io/r/#/c/2623/ Change-Id: I2e55b4c25c2f9ec505282addd4137b2dccf56f93 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rwxr-xr-xlisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocatorSetCustomizer.java14
-rw-r--r--lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/LocatorDumpExecutor.java6
-rwxr-xr-xlisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java4
-rwxr-xr-xlisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizerTest.java2
4 files changed, 14 insertions, 12 deletions
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocatorSetCustomizer.java
index 52b33815c..5038e0d1e 100755
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocatorSetCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/LocatorSetCustomizer.java
@@ -93,11 +93,11 @@ public class LocatorSetCustomizer extends FutureJVppCustomizer
LispLocatorSetDetailsReplyDump dump = dumpOptional.get();
java.util.Optional<LispLocatorSetDetails> details = dump.lispLocatorSetDetails.stream()
- .filter(n -> keyName.equals(TranslateUtils.toString(n.locatorSetName)))
+ .filter(n -> keyName.equals(TranslateUtils.toString(n.lsName)))
.findFirst();
if (details.isPresent()) {
- final String name = TranslateUtils.toString(details.get().locatorSetName);
+ final String name = TranslateUtils.toString(details.get().lsName);
builder.setName(name);
builder.setKey(new LocatorSetKey(name));
@@ -123,20 +123,20 @@ public class LocatorSetCustomizer extends FutureJVppCustomizer
return dumpOptional.get().lispLocatorSetDetails.stream()
.map(set -> {
- final String locatorSetName = TranslateUtils.toString(set.locatorSetName);
+ final String locatorSetName = TranslateUtils.toString(set.lsName);
//creates mapping for existing locator-set(if it is'nt already existing one)
if (!locatorSetContext.containsIndex(locatorSetName, context.getMappingContext())) {
- locatorSetContext.addName(set.locatorSetIndex, locatorSetName, context.getMappingContext());
+ locatorSetContext.addName(set.lsIndex, locatorSetName, context.getMappingContext());
}
LOG.trace("Locator Set with name: {}, VPP name: {} and index: {} found in VPP",
- locatorSetContext.getName(set.locatorSetIndex, context.getMappingContext()),
+ locatorSetContext.getName(set.lsIndex, context.getMappingContext()),
locatorSetName,
- set.locatorSetIndex);
+ set.lsIndex);
return set;
})
- .map(set -> new LocatorSetKey(TranslateUtils.toString(set.locatorSetName)))
+ .map(set -> new LocatorSetKey(TranslateUtils.toString(set.lsName)))
.collect(Collectors.toList());
} else {
LOG.warn("No data dumped for Locator Set {}", id);
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/LocatorDumpExecutor.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/LocatorDumpExecutor.java
index 16e6deaab..8949f44f2 100644
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/LocatorDumpExecutor.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/read/dump/executor/LocatorDumpExecutor.java
@@ -48,8 +48,10 @@ public class LocatorDumpExecutor extends AbstractDumpExecutor
checkNotNull(params, "Params for dump request not present");
LispLocatorDump request = new LispLocatorDump();
- request.locatorSetIndex = params.getLocatorSetIndex();
- request.filter = params.getFilter();
+ request.lsIndex = params.getLocatorSetIndex();
+ // TODO: HONEYCOMB-211: fix support for locator set filtering
+ // request.lsName
+ // request.filter = params.getFilter();
try {
return TranslateUtils.getReply(vppApi.lispLocatorDump(request).toCompletableFuture());
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java
index d6eaf4f68..2a3c12454 100755
--- a/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizer.java
@@ -149,9 +149,9 @@ public class LocatorSetCustomizer extends FutureJVppCustomizer
if (reply.isPresent()) {
return reply.get().lispLocatorSetDetails.stream()
- .filter(a -> name.equals(TranslateUtils.toString(a.locatorSetName)))
+ .filter(a -> name.equals(TranslateUtils.toString(a.lsName)))
.collect(RWUtils.singleItemCollector())
- .locatorSetIndex;
+ .lsIndex;
} else {
throw new IllegalStateException("Unable to find index of locator set " + name);
}
diff --git a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizerTest.java
index e7fb88ae5..71930890c 100755
--- a/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/honeycomb/lisp/translate/write/LocatorSetCustomizerTest.java
@@ -94,7 +94,7 @@ public class LocatorSetCustomizerTest {
final LispLocatorSetDetailsReplyDump reply = new LispLocatorSetDetailsReplyDump();
LispLocatorSetDetails details = new LispLocatorSetDetails();
- details.locatorSetName = "Locator".getBytes(StandardCharsets.UTF_8);
+ details.lsName = "Locator".getBytes(StandardCharsets.UTF_8);
reply.lispLocatorSetDetails = ImmutableList.of(details);
cache.put(io.fd.honeycomb.lisp.translate.read.LocatorSetCustomizer.LOCATOR_SETS_CACHE_ID, reply);