Merge "Test suite for flex-grid support" into stable/aluminium

diff --cc tox.ini
index fd6763d5f61c5f4a292815a9df3db009be151f83,5e6b31a236f4ccbfc7d0ec19e7a5018e010bfd7f..6df0e2fc10ca55b2c8d18ac2290388b7e44abece
--- 1/tox.ini
--- 2/tox.ini
+++ b/tox.ini
@@@ -34,10 -34,10 +34,10 @@@ commands 
    # sh -c 'sed -i'"'"'_'"'"' '"'"'1 a\'"'"'$'"'"'\n. \$(dirname \$0)/\.\./\.\./\.\./\.\./tests/reflectwarn.sh\n'"'"' ../karaf/target/assembly/bin/karaf'
    # ,what results in an unexpected different formating (with a $ on the second line and the dot on the third)
  #build Lighty if needed
-   {py3,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end,portmapping221,rspn221,otnrenderer,otnshrenderer,topology221,otntopology,olm221,tapi221,otnend2end,end2end221,gnpy}: - sh -c 'if [ "$USE_LIGHTY" = "True" ]; then (cd ../lighty && ./build.sh); fi'
+   {py3,portmapping,topoPortMapping,flexgrid,rspn,topology,pce,olm,end2end,portmapping221,rspn221,otnrenderer,otnshrenderer,topology221,otntopology,olm221,tapi221,otnend2end,end2end221,gnpy}: - sh -c 'if [ "$USE_LIGHTY" = "True" ]; then (cd ../lighty && ./build.sh); fi'
  #run 1.2.1 functional tests
    {py3,portmapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_portmapping.py
 -  {py3,topoPortMapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_topoPortMapping.py
 +  {py3,topoPortMapping}: nosetests --with-xunit transportpce_tests/1.2.1/test_topo_portmapping.py
    {py3,topology}: nosetests --with-xunit transportpce_tests/1.2.1/test_topology.py
    {py3,rspn}: nosetests --with-xunit transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
    {py3,pce}: nosetests --with-xunit transportpce_tests/1.2.1/test_pce.py