X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=e3474af59cbaa3a132a21ed4f410aed840145d67;hb=33367f76cbe86a300daa70f3c4df945951afd5d9;hp=f095042413abab3b4d819a7582e8077d3d40ba93;hpb=1abb16171471827939d2a85fd163803a16c335a0;p=transportpce.git

diff --git a/tox.ini b/tox.ini
index f09504241..e3474af59 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,22 +13,30 @@ 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}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh  ; fi"
-  {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)"
-  {py27,topology,topoPortMapping}: - ./buildTesttool.sh
-  {py27,portmapping,rspn,olm,end2end}: - ./buildHoneynode.sh
-  #py27: nosetests --with-xunit transportpce_tests/
-  {py27,portmapping}: - nosetests --with-xunit transportpce_tests/test_portmapping.py
-  {py27,topoPortMapping}: - nosetests --with-xunit transportpce_tests/test_topoPortMapping.py
-  {py27,topology}: - nosetests --with-xunit transportpce_tests/test_topology.py
-  {py27,rspn}: - nosetests --with-xunit transportpce_tests/test_renderer_service_path_nominal.py
-  {py27,pce}: - nosetests --with-xunit transportpce_tests/test_pce.py
-  {py27,olm}: - nosetests --with-xunit transportpce_tests/test_olm.py
-  {servicehandler}: - ./SH_func_tests.sh
-  {servicehandler}: - nosetests --with-xunit transportpce_tests/test_servicehandler.py
-  {py27,end2end}: - nosetests --with-xunit transportpce_tests/test_end2end.py
+  {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221,gnpy}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh  ; fi"
+  {py27,portmapping,topoPortMapping,rspn,topology,olm,end2end,portmapping221,rspn221,topology221,olm221,end2end221,gnpy}: - 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,gnpy}: - 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
+  {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
+  {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]