Adapt hc2vpp to jvpp error logging improvements

Requires https://gerrit.fd.io/r/#/c/7681/

Change-Id: Icd1d5dfb60f5eb79f9f4ab46f38d56f2b01672da
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java
index dad3323..8ee9332 100644 (file)
--- a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java
+++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/translate/read/ItrRemoteLocatorSetCustomizerTest.java
@@ -146,7 +146,9 @@ public class ItrRemoteLocatorSetCustomizerTest
                     @Override
                     public OneGetMapRequestItrRlocsReply get(final long l, final TimeUnit timeUnit)
                             throws InterruptedException, ExecutionException, TimeoutException {
-                        throw new ExecutionException(new VppCallbackException("oneGetMapRequestItrRlocs", 1, -2));
+                        throw new ExecutionException(
+                                new VppCallbackException("oneGetMapRequestItrRlocs", "oneGetMapRequestItrRlocs failed",
+                                        1, -2));
                     }
                 });
     }

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 7fc691b..7d53b4a 100644 (file)
--- 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
@@ -129,7 +129,8 @@ public class ItrRemoteLocatorSetCustomizerTest extends LispWriterCustomizerTest
                     @Override
                     public OneAddDelMapRequestItrRlocsReply get(final long l, final TimeUnit timeUnit)
                             throws InterruptedException, ExecutionException, TimeoutException {
-                        throw new ExecutionException(new VppCallbackException("oneAddDelMapRequestItrRlocs", 1, -2));
+                        throw new ExecutionException(new VppCallbackException("oneAddDelMapRequestItrRlocs",
+                                "oneAddDelMapRequestItrRlocs failed", 1, -2));
                     }
                 });
     }

diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java
index 2bedb95..bdce21f 100644 (file)
--- a/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/hc2vpp/common/test/util/FutureProducer.java
@@ -58,6 +58,6 @@ public interface FutureProducer {
      * @param <T> the result type of returned future
      */
     default <T> CompletableFuture<T> failedFuture() {
-        return failedFuture(new VppCallbackException("test-call", 1 /* ctxId */, -1 /* retval */));
+        return failedFuture(new VppCallbackException("test-call", "test error msg", 1 /* ctxId */, -1 /* retval */));
     }
 }