Allow Karaf to use altern. RESTCONF and akka ports

[transportpce.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index b763ce428a3c2b94e5b653ccc0b1bea08bc8800d..a26f0dd100679ae90185b4522ac5520f69a172c7 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -34,7 +34,7 @@ commands =
 #build controller, source JDK_JAVA_OPTIONS to remove illegal reflective acces warnings introduced by Java11
   sh -c ". $PWD/reflectwarn.sh && cd .. && mvn clean install -B -q -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true -Dodlparent.spotbugs.skip -Dodlparent.checkstyle.skip"
   sh -c "mv  ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java_  ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java"
-#patch Karaf exec for the same reason at runtime
+#patch Karaf exec for the same reason at runtime and also to have the possibility to use alternative ports
   sh -c "../karaf/target/assembly/ressources/post_install_for_tests.sh"
 #build Lighty if needed
   sh -c 'if [ "$USE_LIGHTY" = "True" ]; then (cd ../lighty && ./build.sh); fi'
@@ -76,7 +76,7 @@ setenv =
     USE_ODL_ALT_WEBSOCKET_PORT=8186
     USE_ODL_ALT_AKKA_PORT=2551
     USE_ODL_ALT_AKKA_MGT_PORT=8559
-#    USE_ODL_ALT_RESTCONF_PORT=8182
+    USE_ODL_ALT_RESTCONF_PORT=8182
 commands =
   ./launch_tests.sh 1.2.1 {posargs:}
 # By default, all tests in the folder transportpce_tests/1.2.1/ are run.
@@ -98,7 +98,7 @@ setenv =
     USE_ODL_ALT_WEBSOCKET_PORT=8187
     USE_ODL_ALT_AKKA_PORT=2552
     USE_ODL_ALT_AKKA_MGT_PORT=8560
-#    USE_ODL_ALT_RESTCONF_PORT=8183
+    USE_ODL_ALT_RESTCONF_PORT=8183
 commands =
   ./launch_tests.sh 2.2.1 {posargs:}
 
@@ -111,7 +111,7 @@ setenv =
     USE_ODL_ALT_WEBSOCKET_PORT=8188
     USE_ODL_ALT_AKKA_PORT=2553
     USE_ODL_ALT_AKKA_MGT_PORT=8561
-#    USE_ODL_ALT_RESTCONF_PORT=8184
+    USE_ODL_ALT_RESTCONF_PORT=8184
 commands =
   ./launch_tests.sh 7.1 {posargs:}