Configure streams' basePath

Use lighty.io's restconfServletContextPath as basePath for NETCONF streams configuration. JIRA: LIGHTY-290 Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>
ihrasko · May 6, 2024 · dcfd979 · dcfd979
1 parent dc145c0
commit dcfd979
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...src/main/java/io/lighty/modules/northbound/restconf/community/impl/CommunityRestConf.java b/...src/main/java/io/lighty/modules/northbound/restconf/community/impl/CommunityRestConf.java
@@ -95,7 +95,8 @@ public CommunityRestConf(final DOMDataBroker domDataBroker,
     @Override
     protected boolean initProcedure() {
         final Stopwatch stopwatch = Stopwatch.createStarted();
-        final StreamsConfiguration streamsConfiguration = RestConfConfigUtils.getStreamsConfiguration();
+        final StreamsConfiguration streamsConfiguration = RestConfConfigUtils
+            .getStreamsConfiguration(restconfServletContextPath);
 
         LOG.info("Starting RestconfApplication with configuration {}", streamsConfiguration);
 

diff --git a/...n/java/io/lighty/modules/northbound/restconf/community/impl/util/RestConfConfigUtils.java b/...n/java/io/lighty/modules/northbound/restconf/community/impl/util/RestConfConfigUtils.java
@@ -169,7 +169,9 @@ public static RestConfConfiguration getDefaultRestConfConfiguration() {
         return new RestConfConfiguration();
     }
 
-    public static StreamsConfiguration getStreamsConfiguration() {
-        return new StreamsConfiguration(MAXIMUM_FRAGMENT_LENGTH, IDLE_TIMEOUT, HEARTBEAT_INTERVAL, USE_SSE);
+    public static StreamsConfiguration getStreamsConfiguration(final String restconfServletContextPath) {
+        // we use, for example "/rests" as restconfServletContextPath but NETCONF expects just "rests" as basePath
+        final var basePath = restconfServletContextPath.substring(1);
+        return new StreamsConfiguration(MAXIMUM_FRAGMENT_LENGTH, IDLE_TIMEOUT, HEARTBEAT_INTERVAL, USE_SSE, basePath);
     }
 }