X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=202991a8562ae365c3eb745eaa039d355afa4e30;hb=819d009eb8f97c15bdf074e132612f17f2e4fbc1;hp=298c8cb3f6895ae4d457af29680e7fc697b7cd1f;hpb=c3a98ef9475e9ce8ec866978df75394c3df639bf;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index 298c8cb3f..202991a85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,10 @@
 [tox]
 minversion = 3.7.0
-envlist = buildcontroller,testsPCE,sims121,tests121,sims221,tests221,sims71,tests71,tests_hybrid
+envlist = buildcontroller,testsPCE,
+    sims121,build_karaf_tests121,tests121,
+    sims221,build_karaf_tests221,tests221,
+    sims71,build_karaf_tests71,tests71,
+    build_karaf_tests_hybrid,tests_hybrid,
     docs
     docs-linkcheck
     checkbashisms
@@ -11,8 +15,8 @@ setupdir = tests/
 
 [testenv]
 passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
-setenv =
-    USE_LIGHTY=True
+#setenv =
+#    USE_LIGHTY=True
 usedevelop = true
 basepython = python3
 deps =
@@ -23,21 +27,9 @@ changedir = {toxinidir}/tests
 parallel_show_output = true
 
 [testenv:buildcontroller]
-whitelist_externals = sh
-                      sudo
+whitelist_externals = build_controller.sh
 commands =
-#install maven and JDK11 on the Gate since they are not there by default
-  sh -c "which mvn >/dev/null || ./installMavenCentOS.sh"
-#patch OLM constant to speed up tests, unnecessary for PCE tests
-  sh -c "sed -i'_' 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java"
-  sh -c 'if [ "$USE_LIGHTY" != "True" ]; then (cd ../; for suffix in 121 221 71; do rm -rf "karaf$suffix"; cp -r karaf "karaf$suffix";done) ; fi'
-#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 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'
+  ./build_controller.sh
 
 [testenv:sims121]
 whitelist_externals = install_honeynode.sh
@@ -62,26 +54,33 @@ commands =
 [testenv:testsPCE]
 depends = buildcontroller
 whitelist_externals = launch_tests.sh
+passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+#setenv =
+#    USE_LIGHTY=True
+commands =
+  ./launch_tests.sh pce {posargs:}
+
+[testenv:build_karaf_tests121]
+depends = buildcontroller
+# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
+whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-    USE_LIGHTY=True
+#    USE_LIGHTY=True
+    USE_ODL_ALT_KARAF_ENV=./karaf121.env
+    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
-  ./launch_tests.sh pce {posargs:}
+  ./build_karaf_for_tests.sh
 
 [testenv:tests121]
-depends = buildcontroller,sims121,testsPCE
+depends = buildcontroller,build_karaf_tests121,sims121,testsPCE
 # testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY
+passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
-    USE_LIGHTY=True
-    USE_ODL_ALT_WEBSOCKET_PORT=8186
-    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
+#    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
   ./launch_tests.sh 1.2.1 {posargs:}
@@ -94,80 +93,100 @@ commands =
 # which is more verbose than nose or 'export LAUNCHER="ls -l"' to only list script
 # files attributes.
 
+[testenv:build_karaf_tests221]
+depends = buildcontroller
+# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
+whitelist_externals = launch_tests.sh
+passenv = LAUNCHER USE_LIGHTY
+setenv =
+#    USE_LIGHTY=True
+    USE_ODL_ALT_KARAF_ENV=./karaf221.env
+    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
+commands =
+  ./build_karaf_for_tests.sh
+
 [testenv:tests221]
-depends = buildcontroller,sims221,tests71
+depends = buildcontroller,build_karaf_tests221,sims221,tests71
 # tests71 dependency is only here to chain tests in the gate and avoid ressources starvation
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY
+passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
-    USE_LIGHTY=True
-    USE_ODL_ALT_WEBSOCKET_PORT=8187
-    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
+#    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
 commands =
   ./launch_tests.sh 2.2.1 {posargs:}
 
-[testenv:tests71]
-depends = buildcontroller,sims71
+[testenv:build_karaf_tests71]
+depends = buildcontroller
+# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-    USE_LIGHTY=True
-    USE_ODL_ALT_WEBSOCKET_PORT=8188
-    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
+#    USE_LIGHTY=True
+    USE_ODL_ALT_KARAF_ENV=./karaf71.env
+    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
+commands =
+  ./build_karaf_for_tests.sh
+
+[testenv:tests71]
+depends = buildcontroller,build_karaf_tests71,sims71
+whitelist_externals = launch_tests.sh
+passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+setenv =
+#    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
   ./launch_tests.sh 7.1 {posargs:}
 
+[testenv:build_karaf_tests_hybrid]
+depends = buildcontroller
+# testsPCE dependency is only here to chain tests in the gate and avoid resources starvation
+whitelist_externals = launch_tests.sh
+passenv = LAUNCHER USE_LIGHTY
+setenv =
+#    USE_LIGHTY=True
+    USE_ODL_ALT_KARAF_ENV=./karaf121.env
+    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
+commands =
+  ./build_karaf_for_tests.sh
+
 [testenv:tests_hybrid]
 depends = buildcontroller,sims121,sims221,sims71,tests121,tests221,tests71
 #the last dependency is to avoid temporarily concurrent ressources problem in parallel mode
 whitelist_externals = launch_tests.sh
-passenv = LAUNCHER USE_LIGHTY
+passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
-    USE_LIGHTY=True
-    USE_ODL_ALT_WEBSOCKET_PORT=8186
-    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
-    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
+#    USE_LIGHTY=True
+    USE_ODL_ALT_KARAF_ENV=./karaf121.env
+    USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
 #  nosetests --with-xunit transportpce_tests/hybrid/test01_device_change_notifications.py
   ./launch_tests.sh hybrid {posargs:}
 
 [testenv:gnpy]
 depends = buildcontroller
-whitelist_externals = sh
-                      sudo
-passenv = LAUNCHER USE_LIGHTY
+whitelist_externals = launch_tests.sh
+                      dockercmd.sh
+passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 commands =
   #sudo docker pull atriki/gnpyrest:v1.2
-  sudo docker run -d -p 8008:5000 --name gnpy_tpce_rest1 atriki/gnpyrest:v1.2
+  ./dockercmd.sh run -d -p 8008:5000 --name gnpy_tpce_rest1 atriki/gnpyrest:v1.2
   ./launch_tests.sh with_docker gnpy
-  sudo docker container rm -f gnpy_tpce_rest1
+  ./dockercmd.sh container rm -f gnpy_tpce_rest1
 
 [testenv:nbinotifications]
 depends = buildcontroller,sims221
-whitelist_externals = sh
-                      sudo
-passenv = LAUNCHER USE_LIGHTY
+whitelist_externals = launch_tests.sh
+                      dockercmd.sh
+passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 commands =
-  sudo docker-compose -f ./nbinotifications/docker-compose.yml up -d
+  ./dockercmd.sh run -d -p 2181:2181 -p 9092:9092 --env ADVERTISED_LISTENERS=PLAINTEXT://localhost:9092 --name tpce_kafka1 teivah/kafka:2.0.0
   ./launch_tests.sh with_docker nbinotifications
-  sudo docker-compose -f ./nbinotifications/docker-compose.yml down --rmi all
+  ./dockercmd.sh container rm -f tpce_kafka1
 
 [testenv:docs]
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
@@ -211,7 +230,7 @@ basepython = python3
 deps = pylint
 whitelist_externals = find
 commands =
-    find transportpce_tests/ -name *.py -exec pylint --max-line-length=120 --disable=missing-docstring --method-rgx="(([a-z_][a-zA-Z0-9_]{2,})|(_[a-z0-9_]*)|(__[a-zA-Z][a-zA-Z0-9_]+__))$" --variable-rgx="[a-zA-Z_][a-zA-Z0-9_]{1,30}$" --reports=y --score=y  --output-format=colorized  \{\} +
+    find transportpce_tests/ -name *.py -exec pylint --max-line-length=120 --disable=missing-docstring --module-rgx="([a-z0-9_]+$)|([0-9.]{1,30}$)" --method-rgx="(([a-z_][a-zA-Z0-9_]{2,})|(_[a-z0-9_]*)|(__[a-zA-Z][a-zA-Z0-9_]+__))$" --variable-rgx="[a-zA-Z_][a-zA-Z0-9_]{1,30}$" --reports=y --score=y  --output-format=colorized  \{\} +
 
 [testenv:pyang]
 basepython = python3
@@ -244,6 +263,12 @@ commands =
     pre-commit uninstall
     pre-commit uninstall --hook-type commit-msg
 
+[testenv:pre-commit-autoupdate]
+basepython = python3
+deps = pre-commit
+commands =
+    pre-commit autoupdate
+
 [testenv:pre-commit]
 basepython = python3
 deps = pre-commit