X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=7cd80337c4c2f7a9728298e591a2d06d4f37e82c;hb=791363064da49cc631aae713ec1cd86db98c4fde;hp=a2b03df381cf22f97e1dac9b9be2aec5fb072f27;hpb=86c3b4e94cf42967e57427d1b0ca1ea5c3b7f3ca;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index a2b03df38..7cd80337c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,37 +1,45 @@
 [tox]
 minversion = 1.6
-envlist = py27
+envlist = py35
     docs
     docs-linkcheck
 skipsdist = true
 setupdir = tests/
 
 [testenv]
+passenv = USE_LIGHTY
 usedevelop = True
-basepython = python2.7
+basepython = python3.5
 deps =
   -r{toxinidir}/tests/requirements.txt
   -r{toxinidir}/tests/test-requirements.txt
 whitelist_externals = bash
+                      sudo
 changedir={toxinidir}/tests
 commands =
-  {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh  ; fi"
-  {py27,portmapping,topoPortMapping,rspn,topology,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221}: - bash -c "sed 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java >/tmp/pivot; mv /tmp/pivot ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java"
-  {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)"
-  {py27,portmapping,topoPortMapping,rspn,topology,olm,end2end}: - ./buildHoneynode.sh
-  {py27,portmapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_portmapping.py
-  {py27,topoPortMapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_topoPortMapping.py
-  {py27,topology}: nosetests --with-xunit transportpce_tests/1.2.1/test_topology.py
-  {py27,rspn}: nosetests --with-xunit transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
-  {py27,pce}: nosetests --with-xunit transportpce_tests/1.2.1/test_pce.py
-  {py27,olm}: nosetests --with-xunit transportpce_tests/1.2.1/test_olm.py
-  #{py27,end2end}: - nosetests --with-xunit transportpce_tests/1.2.1/test_end2end.py
-  {py27,portmapping221,rspn221,topology221,olm221,end2end221}: - ./buildHoneynode.sh 2.2.1
-  {py27,portmapping221}: nosetests --with-xunit transportpce_tests/2.2.1/test_portmapping.py
-  {py27,topology221}: nosetests --with-xunit transportpce_tests/2.2.1/test_topology.py
-  {py27,rspn221}: nosetests --with-xunit transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
-  {py27,olm221}: nosetests --with-xunit transportpce_tests/2.2.1/test_olm.py
-  {py27,end2end221}: - nosetests --with-xunit transportpce_tests/2.2.1/test_end2end.py
+  {py35,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,otntopology,olm221,end2end221,gnpy}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh  ; fi"
+  {py35,portmapping,topoPortMapping,rspn,topology,olm,end2end,portmapping221,rspn221,topology221,otn-topology,olm221,end2end221}: - bash -c "sed 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java >/tmp/pivot; mv /tmp/pivot ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java"
+  {py35,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,otntopology,olm221,end2end221,gnpy}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)"
+  {py35,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,otntopology,olm221,end2end221,gnpy}: - bash -c 'if [ "$USE_LIGHTY" == "True" ]; then (cd ../lighty && ./build.sh); fi'
+  {py35,portmapping,topoPortMapping,rspn,topology,olm,end2end}: - ./buildHoneynode.sh
+  {py35,portmapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_portmapping.py
+  {py35,topoPortMapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_topoPortMapping.py
+  {py35,topology}: nosetests --with-xunit transportpce_tests/1.2.1/test_topology.py
+  {py35,rspn}: nosetests --with-xunit transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
+  {py35,pce}: nosetests --with-xunit transportpce_tests/1.2.1/test_pce.py
+  {py35,olm}: nosetests --with-xunit transportpce_tests/1.2.1/test_olm.py
+  {end2end}: nosetests --with-xunit transportpce_tests/1.2.1/test_end2end.py
+  {py35,portmapping221,rspn221,topology221,otntopology,olm221,end2end221}: - ./buildHoneynode.sh 2.2.1
+  {py35,portmapping221}: nosetests --with-xunit transportpce_tests/2.2.1/test_portmapping.py
+  {py35,topology221}: nosetests --with-xunit transportpce_tests/2.2.1/test_topology.py
+  {otntopology}: nosetests --with-xunit transportpce_tests/2.2.1/test_otn_topology.py
+  {py35,rspn221}: nosetests --with-xunit transportpce_tests/2.2.1/test_renderer_service_path_nominal.py
+  {py35,olm221}: nosetests --with-xunit transportpce_tests/2.2.1/test_olm.py
+  {end2end221}: nosetests --with-xunit transportpce_tests/2.2.1/test_end2end.py
+  #{gnpy}: - sudo docker pull atriki/gnpyrest:v1.1
+  {gnpy}: - sudo docker run -d -p 8008:5000 --name gnpy_tpce_rest1 atriki/gnpyrest:v1.1
+  {gnpy}: nosetests --with-xunit transportpce_tests/1.2.1/test_gnpy.py
+  {gnpy}: - sudo docker container rm -f gnpy_tpce_rest1
 
 
 [testenv:docs]
@@ -39,7 +47,7 @@ deps = -rdocs/requirements.txt
 commands =
     sphinx-build -W -b html -n -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/html
 
-[testenv:docs-linkcheck]
-deps = -rdocs/requirements.txt
-commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/linkcheck
+#[testenv:docs-linkcheck]
+#deps = -rdocs/requirements.txt
+#commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ../docs/ {toxinidir}/docs/_build/linkcheck