X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=db710a348e18b210964f646975500be76cf99fc7;hb=5af40d0286cf6aed4ca4a03ed36713d5f78b335f;hp=8131efd36ef5432788957a77c27a112fa60f1fac;hpb=3ae68a70707803922d8dd897198568ad8eb4f7c8;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index 8131efd36..db710a348 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,9 +15,12 @@ skipsdist = true
 setupdir = tests/
 
 [testenv]
-passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
-#setenv =
+passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OLM_TIMER1 OLM_TIMER2
+setenv =
 #    USE_LIGHTY=True
+    OLM_TIMER1=3000
+    OLM_TIMER2=2000
+
 usedevelop = true
 basepython = python3
 deps =
@@ -54,6 +57,14 @@ commands =
 
 [testenv:testsPCE]
 depends = buildcontroller
+#the following lines retrieve unofficial package of GNPy with REST support from Orange opensource Gitlab repo
+setenv =
+  PIP_EXTRA_INDEX_URL = https://gitlab.com/api/v4/projects/33090323/packages/pypi/simple
+deps =
+  -r{toxinidir}/tests/requirements.txt
+  -r{toxinidir}/tests/test-requirements.txt
+  setuptools>=7.0
+  gnpy4tpce
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 #setenv =
@@ -137,7 +148,7 @@ 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_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
@@ -168,22 +179,15 @@ commands =
 #  nosetests --with-xunit transportpce_tests/hybrid/test01_device_change_notifications.py
   ./launch_tests.sh hybrid {posargs:}
 
-[testenv:gnpy]
-depends = buildcontroller
-whitelist_externals = launch_tests.sh
-                      dockercmd.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
-commands =
-  #sudo docker pull 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
-  ./dockercmd.sh container rm -f gnpy_tpce_rest1
-
 [testenv:nbinotifications]
 depends = buildcontroller,sims221
 whitelist_externals = launch_tests.sh
                       dockercmd.sh
-passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
+passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION OLM_TIMER1 OLM_TIMER2
+setenv =
+    OLM_TIMER1=3000
+    OLM_TIMER2=2000
+
 commands =
   ./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