From 398c9b251dc910c4cffc4fc5a3c2b8b221980c91 Mon Sep 17 00:00:00 2001
From: ebo <eliezio.oliveira@est.tech>
Date: Sat, 11 Apr 2020 01:34:47 +0100
Subject: netconf-pnp-simulator: enable NETCONF send/recv message logging

to aid troubleshooting integration with OpenDaylight

- Add more integration tests
- Defaults to generic subscriber

Issue-ID: INT-1516
Change-Id: Ib5bbf4cdbba6cdfee901f6c07dfa195a21cd8bbb
Signed-off-by: ebo <eliezio.oliveira@est.tech>
---
 test/mocks/netconf-pnp-simulator/engine/configure-modules.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'test/mocks/netconf-pnp-simulator/engine/configure-modules.sh')

diff --git a/test/mocks/netconf-pnp-simulator/engine/configure-modules.sh b/test/mocks/netconf-pnp-simulator/engine/configure-modules.sh
index 2010b504f..d40918f31 100755
--- a/test/mocks/netconf-pnp-simulator/engine/configure-modules.sh
+++ b/test/mocks/netconf-pnp-simulator/engine/configure-modules.sh
@@ -26,6 +26,7 @@ source $HERE/common.sh
 
 MODELS_CONFIG=$CONFIG/modules
 BASE_VIRTUALENVS=$HOME/.local/share/virtualenvs
+GENERIC_SUBSCRIBER=/opt/bin/generic_subscriber.py
 
 install_and_configure_yang_model()
 {
@@ -54,6 +55,8 @@ configure_subscriber_execution()
     APP_PATH=$env_dir/bin:$APP_PATH
   fi
   log INFO Preparing launching of module \"$model\" application
+  # shellcheck disable=SC2153
+  loguru_format="${LOGURU_FORMAT//\{module\}/$model}"
   cat > /etc/supervisord.d/$model.conf <<EOF
 [program:subs-$model]
 command=$app $model
@@ -61,7 +64,7 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 redirect_stderr=true
 autorestart=true
-environment=PATH=$APP_PATH,PYTHONUNBUFFERED="1"
+environment=PATH=$APP_PATH,PYTHONUNBUFFERED="1",LOGURU_FORMAT="$loguru_format"
 EOF
 }
 
@@ -89,7 +92,11 @@ for dir in "$MODELS_CONFIG"/*; do
     install_and_configure_yang_model $dir $model
     app="$dir/subscriber.py"
     if [ -x "$app" ]; then
-      configure_subscriber_execution $dir $model $app
+      log INFO Module $model is using its own subscriber
+    else
+      log WARN Module $model is using the generic subscriber
+      app=$GENERIC_SUBSCRIBER
     fi
+    configure_subscriber_execution $dir $model $app
   fi
 done
-- 
cgit 1.2.3-korg