From 171be0ad6aa2f6a481298b51cc0da173fdbc00a1 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 5 Jul 2021 10:35:17 +0200 Subject: [PATCH] Refactor Karaf post-install scripts for tests JIRA: TRNSPRTPCE-482 Signed-off-by: guillaume.lambert Change-Id: I7e6d949887d41528545d78e15bc8ddee89019b75 --- .../assembly/ressources/karaf_pre_launch.sh | 44 ++++++++++++++++++ .../ressources/post_install_for_tests.sh | 46 ++----------------- 2 files changed, 49 insertions(+), 41 deletions(-) create mode 100755 karaf/src/main/assembly/ressources/karaf_pre_launch.sh diff --git a/karaf/src/main/assembly/ressources/karaf_pre_launch.sh b/karaf/src/main/assembly/ressources/karaf_pre_launch.sh new file mode 100755 index 000000000..98955b943 --- /dev/null +++ b/karaf/src/main/assembly/ressources/karaf_pre_launch.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +. $(dirname $0)/../../../../tests/reflectwarn.sh + +echo 'karaf exec tainted for tests' + +mkdir -p $(dirname $0)/../configuration/initial/ +if [ -z "$USE_ODL_ALT_RESTCONF_PORT" ]; then + RESTCONF_PORT=8181 +else + RESTCONF_PORT=$USE_ODL_ALT_RESTCONF_PORT +fi +sed -e "s/ODL_RESTCONF_PORT/$RESTCONF_PORT/" $(dirname $0)/../ressources/org.ops4j.pax.web._template.cfg >$(dirname $0)/../etc/org.ops4j.pax.web.cfg +sed -e "s/ODL_RESTCONF_PORT/$RESTCONF_PORT/" $(dirname $0)/../ressources/jetty_template.xml >$(dirname $0)/../etc/jetty.xml +if [ -z "$USE_ODL_ALT_AKKA_PORT" ]; then + AKKA_PORT=2550 +else + AKKA_PORT=$USE_ODL_ALT_AKKA_PORT +fi +sed -e "s/ODL_AKKA_PORT/$AKKA_PORT/" $(dirname $0)/../ressources/akka-default_template.conf >$(dirname $0)/../configuration/initial/akka.conf +if [ -z "$USE_ODL_ALT_SHELL_PORT" ]; then + SHELL_PORT=8101 +else + SHELL_PORT=$USE_ODL_ALT_SHELL_PORT +fi +sed -e "s/ODL_SHELL_PORT/$SHELL_PORT/" $(dirname $0)/../ressources/org.apache.karaf.shell._template.cfg >$(dirname $0)/../etc/org.apache.karaf.shell.cfg +if [ -z "$USE_ODL_ALT_RMI_REGISTRY_PORT" ]; then + RMI_REGISTRY_PORT=1099 +else + RMI_REGISTRY_PORT=$USE_ODL_ALT_RMI_REGISTRY_PORT +fi +if [ -z "$USE_ODL_ALT_RMI_SERVER_PORT" ]; then + RMI_SERVER_PORT=44444 +else + RMI_SERVER_PORT=$USE_ODL_ALT_RMI_SERVER_PORT +fi +sed -e "s/ODL_RMI_REGISTRY_PORT/$RMI_REGISTRY_PORT/" -e "s/ODL_RMI_SERVER_PORT/$RMI_SERVER_PORT/" $(dirname $0)/../ressources/org.apache.karaf.management._template.cfg >$(dirname $0)/../etc/org.apache.karaf.management.cfg +if [ -z "$USE_ODL_ALT_WEBSOCKET_PORT" ]; then + WEBSOCKET_PORT=8185 +else + WEBSOCKET_PORT=$USE_ODL_ALT_WEBSOCKET_PORT +fi +sed -e "s/ODL_WEBSOCKET_PORT/$WEBSOCKET_PORT/" $(dirname $0)/../ressources/org.opendaylight.restconf._template.cfg >$(dirname $0)/../etc/org.opendaylight.restconf.cfg + diff --git a/karaf/src/main/assembly/ressources/post_install_for_tests.sh b/karaf/src/main/assembly/ressources/post_install_for_tests.sh index 9faf529b3..e4bd18119 100755 --- a/karaf/src/main/assembly/ressources/post_install_for_tests.sh +++ b/karaf/src/main/assembly/ressources/post_install_for_tests.sh @@ -1,47 +1,6 @@ #!/bin/sh cd $(dirname $0) -sed -i'_' -e '1 a\ -\ -. \$(dirname \$0)/\.\./\.\./\.\./\.\./tests/reflectwarn.sh\ -mkdir -p \$(dirname \$0)/\.\./configuration/initial/\ -if [ -z "$USE_ODL_ALT_RESTCONF_PORT" ]; then\ - RESTCONF_PORT=8181\ -else\ - RESTCONF_PORT=$USE_ODL_ALT_RESTCONF_PORT\ -fi\ -sed -e "s/ODL_RESTCONF_PORT/$RESTCONF_PORT/" \$(dirname \$0)/\.\./ressources/org.ops4j.pax.web._template.cfg >\$(dirname \$0)/\.\./etc/org.ops4j.pax.web.cfg\ -sed -e "s/ODL_RESTCONF_PORT/$RESTCONF_PORT/" \$(dirname \$0)/\.\./ressources/jetty_template.xml >\$(dirname \$0)/\.\./etc/jetty.xml\ -if [ -z "$USE_ODL_ALT_AKKA_PORT" ]; then\ - AKKA_PORT=2550\ -else\ - AKKA_PORT=$USE_ODL_ALT_AKKA_PORT\ -fi\ -sed -e "s/ODL_AKKA_PORT/$AKKA_PORT/" \$(dirname \$0)/\.\./ressources/akka-default_template.conf >\$(dirname \$0)/\.\./configuration/initial/akka.conf\ -if [ -z "$USE_ODL_ALT_SHELL_PORT" ]; then\ - SHELL_PORT=8101\ -else\ - SHELL_PORT=$USE_ODL_ALT_SHELL_PORT\ -fi\ -sed -e "s/ODL_SHELL_PORT/$SHELL_PORT/" \$(dirname \$0)/\.\./ressources/org.apache.karaf.shell._template.cfg >\$(dirname \$0)/\.\./etc/org.apache.karaf.shell.cfg\ -if [ -z "$USE_ODL_ALT_RMI_REGISTRY_PORT" ]; then\ - RMI_REGISTRY_PORT=1099\ -else\ - RMI_REGISTRY_PORT=$USE_ODL_ALT_RMI_REGISTRY_PORT\ -fi\ -if [ -z "$USE_ODL_ALT_RMI_SERVER_PORT" ]; then\ - RMI_SERVER_PORT=44444\ -else\ - RMI_SERVER_PORT=$USE_ODL_ALT_RMI_SERVER_PORT\ -fi\ -sed -e "s/ODL_RMI_REGISTRY_PORT/$RMI_REGISTRY_PORT/" -e "s/ODL_RMI_SERVER_PORT/$RMI_SERVER_PORT/" \$(dirname \$0)/\.\./ressources/org.apache.karaf.management._template.cfg >\$(dirname \$0)/\.\./etc/org.apache.karaf.management.cfg\ -if [ -z "$USE_ODL_ALT_WEBSOCKET_PORT" ]; then\ - WEBSOCKET_PORT=8185\ -else\ - WEBSOCKET_PORT=$USE_ODL_ALT_WEBSOCKET_PORT\ -fi\ -sed -e "s/ODL_WEBSOCKET_PORT/$WEBSOCKET_PORT/" \$(dirname \$0)/\.\./ressources/org.opendaylight.restconf._template.cfg >\$(dirname \$0)/\.\./etc/org.opendaylight.restconf.cfg\ -' ../bin/karaf sed 's/2550/ODL_AKKA_PORT/' ../system/org/opendaylight/controller/sal-clustering-config/*/sal-clustering-config-*-akkaconf.xml >akka-default_template.conf sed 's/8181/ODL_RESTCONF_PORT/' ../etc/org.ops4j.pax.web.cfg > org.ops4j.pax.web._template.cfg @@ -49,3 +8,8 @@ sed 's/8181/ODL_RESTCONF_PORT/' ../etc/jetty.xml > jetty_template.xml sed 's/8101/ODL_SHELL_PORT/' ../etc/org.apache.karaf.shell.cfg > org.apache.karaf.shell._template.cfg sed -e 's/1099/ODL_RMI_REGISTRY_PORT/' -e 's/44444/ODL_RMI_SERVER_PORT/' ../etc/org.apache.karaf.management.cfg > org.apache.karaf.management._template.cfg sed 's/^[#|]websocket-port=8185/websocket-port=ODL_WEBSOCKET_PORT/' ../system/org/opendaylight/netconf/sal-rest-connector-config/[0-9.]*/sal-rest-connector-config-[0-9.]*-restconf.cfg >org.opendaylight.restconf._template.cfg + +cp ../bin/karaf ../bin/karaf_ +cat karaf_pre_launch.sh ../bin/karaf_ > ../bin/karaf +chmod +x ../bin/karaf + -- 2.36.6