From: guillaume.lambert Date: Mon, 28 Jun 2021 12:53:28 +0000 (+0200) Subject: Allow Karaf to listen to alternative RMI ports X-Git-Tag: 4.0.0~31 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=c8ecfbb2a351c67c7db953aba9c26c5d6ca7b0dd Allow Karaf to listen to alternative RMI ports In Karaf post-install script for tests - generate configuration files templates for Karaf Management - patch Karaf exec to generate configuration files from environment variables and templates In tox.ini - declare the related variables in SETENV parameters Allowing the controller configuration to listen to alternative ports is a commodity to run functional tests in parallel. JIRA: TRNSPRTPCE-482 Signed-off-by: guillaume.lambert Change-Id: Ic2f0db92b9da14fcd65fc9840aa4365b8f9469f8 --- 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 22e9b1127..5adde6d38 100755 --- a/karaf/src/main/assembly/ressources/post_install_for_tests.sh +++ b/karaf/src/main/assembly/ressources/post_install_for_tests.sh @@ -24,9 +24,21 @@ 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\ ' ../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 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 diff --git a/tox.ini b/tox.ini index 648fa3235..4b4695299 100644 --- a/tox.ini +++ b/tox.ini @@ -77,6 +77,8 @@ setenv = USE_ODL_ALT_AKKA_PORT=2551 USE_ODL_ALT_AKKA_MGT_PORT=8559 USE_ODL_ALT_SHELL_PORT=8102 + USE_ODL_ALT_RMI_REGISTRY_PORT=1100 + USE_ODL_ALT_RMI_SERVER_PORT=44445 USE_ODL_ALT_RESTCONF_PORT=8182 commands = ./launch_tests.sh 1.2.1 {posargs:} @@ -100,6 +102,8 @@ setenv = USE_ODL_ALT_AKKA_PORT=2552 USE_ODL_ALT_AKKA_MGT_PORT=8560 USE_ODL_ALT_SHELL_PORT=8103 + USE_ODL_ALT_RMI_REGISTRY_PORT=1101 + USE_ODL_ALT_RMI_SERVER_PORT=44446 USE_ODL_ALT_RESTCONF_PORT=8183 commands = ./launch_tests.sh 2.2.1 {posargs:} @@ -114,6 +118,8 @@ setenv = USE_ODL_ALT_AKKA_PORT=2553 USE_ODL_ALT_AKKA_MGT_PORT=8561 USE_ODL_ALT_SHELL_PORT=8104 + USE_ODL_ALT_RMI_REGISTRY_PORT=1102 + USE_ODL_ALT_RMI_SERVER_PORT=44447 USE_ODL_ALT_RESTCONF_PORT=8184 commands = ./launch_tests.sh 7.1 {posargs:} @@ -129,6 +135,8 @@ setenv = USE_ODL_ALT_AKKA_PORT=2551 USE_ODL_ALT_AKKA_MGT_PORT=8559 USE_ODL_ALT_SHELL_PORT=8102 + USE_ODL_ALT_RMI_REGISTRY_PORT=1100 + USE_ODL_ALT_RMI_SERVER_PORT=44445 USE_ODL_ALT_RESTCONF_PORT=8182 commands = # nosetests --with-xunit transportpce_tests/hybrid/test01_device_change_notifications.py