X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=6a86daa042260b670f0d9ba88b7cb5588dc1de76;hb=122239adbcc8e857aa9eff4a45f6ab1900dfe885;hp=1c3d9abf60064b2383c4f818b7bf81267b86bf3e;hpb=0a83b6936702d50a080b76615b89992d6adc2c4b;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index 1c3d9abf6..6a86daa04 100644
--- a/tox.ini
+++ b/tox.ini
@@ -62,6 +62,13 @@ changedir = {toxinidir}/lighty
 commands =
   ./build.sh
 
+[testenv:sims]
+passenv = USE_SIMS
+allowlist_externals = install_lightynode.sh
+depends = buildcontroller
+commands =
+  ./install_lightynode.sh {posargs:}
+
 [testenv:sims121]
 passenv = USE_SIMS
 allowlist_externals = install_sims.sh
@@ -202,19 +209,18 @@ commands =
 
 [testenv:tests71]
 depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
-allowlist_externals = launch_tests.sh install_honeynode.sh
+allowlist_externals = launch_tests.sh
 passenv = LAUNCHER
     USE_LIGHTY
+    USE_SIMS
     NO_ODL_STARTUP
     USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
-    USE_SIMS=honeynode
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
-  ./install_honeynode.sh 7.1
   ./launch_tests.sh 7.1 {posargs:}
 
 [testenv:build_karaf_tests_hybrid]
@@ -231,21 +237,19 @@ commands =
 [testenv:tests_hybrid]
 depends = buildcontroller,build_karaf_tests_hybrid,sims121,sims221,sims71,tests121,tests221,tests71
 #the last dependency is to avoid temporarily concurrent ressources problem in parallel mode
-allowlist_externals = launch_tests.sh install_honeynode.sh
+allowlist_externals = launch_tests.sh
 passenv = LAUNCHER
     USE_LIGHTY
     USE_SIMS
     NO_ODL_STARTUP
     USE_ODL_RESTCONF_VERSION
 setenv =
-    USE_SIMS=honeynode
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
     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
-  ./install_honeynode.sh
   ./launch_tests.sh hybrid {posargs:}
 
 [testenv:tests_tapi]
@@ -274,15 +278,15 @@ commands =
 
 [testenv:with_docker]
 depends = buildcontroller,sims221
-allowlist_externals = launch_tests.sh dockercmd.sh install_honeynode.sh
+allowlist_externals = launch_tests.sh dockercmd.sh
 passenv = LAUNCHER
     USE_LIGHTY
+    USE_SIMS
     NO_ODL_STARTUP
     USE_ODL_RESTCONF_VERSION
 #    OLM_TIMER1
 #    OLM_TIMER2
 setenv =
-    USE_SIMS=honeynode
     OLM_TIMER1=3000
     OLM_TIMER2=2000
     INSTALL_TAPI=True
@@ -290,7 +294,6 @@ setenv =
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
 
 commands =
-  ./install_honeynode.sh 2.2.1
   ./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 {posargs:}
   ./dockercmd.sh container rm -f tpce_kafka1