2 files changed, 14 insertions, 1 deletions
diff --git a/vpp-common/vpp-common-integration/src/test/java/io/fd/hc2vpp/common/integration/VppCommonModuleTest.java b/vpp-common/vpp-common-integration/src/test/java/io/fd/hc2vpp/common/integration/VppCommonModuleTest.java
index b63601de5..540145beb 100644
--- a/vpp-common/vpp-common-integration/src/test/java/io/fd/hc2vpp/common/integration/VppCommonModuleTest.java
+++ b/vpp-common/vpp-common-integration/src/test/java/io/fd/hc2vpp/common/integration/VppCommonModuleTest.java
@@ -19,6 +19,7 @@ package io.fd.hc2vpp.common.integration;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.Matchers.empty;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.mockito.MockitoAnnotations.initMocks;
 
@@ -27,9 +28,11 @@ import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import com.google.inject.testing.fieldbinder.Bind;
 import com.google.inject.testing.fieldbinder.BoundFieldModule;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
 import io.fd.honeycomb.translate.read.ReaderFactory;
 import java.util.HashSet;
 import java.util.Set;
+import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -49,5 +52,14 @@ public class VppCommonModuleTest {
         initMocks(this);
         Guice.createInjector(new VppCommonModule(), BoundFieldModule.of(this)).injectMembers(this);
         assertThat(readerFactories, is(not(empty())));
+        assertEquals(15, JvppReplyConsumer.JvppReplyTimeoutHolder.getTimeout());
+    }
+
+    public void testConfigureJVppTimeoutIgnoreOnRetry() {
+        initMocks(this);
+        Guice.createInjector(new VppCommonModule(), BoundFieldModule.of(this)).injectMembers(this);
+        JvppReplyConsumer.JvppReplyTimeoutHolder.setupTimeout(1);
+        // reconfiguration is ignored
+        assertEquals(15, JvppReplyConsumer.JvppReplyTimeoutHolder.getTimeout());
     }
 }
 \ No newline at end of file
diff --git a/vpp-common/vpp-common-integration/src/test/resources/jvpp.json b/vpp-common/vpp-common-integration/src/test/resources/jvpp.json
index 1d411872e..4bdaced82 100644
--- a/vpp-common/vpp-common-integration/src/test/resources/jvpp.json
+++ b/vpp-common/vpp-common-integration/src/test/resources/jvpp.json
@@ -1,3 +1,4 @@
 {
-  "jvpp-connection-name": "honeycomb"
+  "jvpp-connection-name": "honeycomb",
+  "jvpp-request-timeout":15
 }
 \ No newline at end of file