From: Gilles Thouenon <gilles.thouenon@orange.com>
Date: Wed, 23 Nov 2022 12:50:03 +0000 (+0100)
Subject: Use lighty build for all functional tests
X-Git-Tag: 5.2.0~3
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2bcfbf2c715413d94f358cdcdac845682b28ab59;p=transportpce.git

Use lighty build for all functional tests

- activate lighty build for all transportpce functional tests to
overcome the TRNSPRTPCE-701 issue
- use draft-bierman02  url for restconf in all functional tests to be
able to use lighty build
- fix lighty start message in test_utils file

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I87cf34d8559bde0cff5148113c9a1950e1f790e4
---

diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py
index 63ab18735..cd9e52b32 100644
--- a/tests/transportpce_tests/common/test_utils.py
+++ b/tests/transportpce_tests/common/test_utils.py
@@ -30,7 +30,7 @@ SIMS = simulators.SIMS
 
 HONEYNODE_OK_START_MSG = 'Netconf SSH endpoint started successfully at 0.0.0.0'
 KARAF_OK_START_MSG = "Blueprint container for bundle org.opendaylight.netconf.restconf.* was successfully created"
-LIGHTY_OK_START_MSG = re.escape("lighty.io and RESTCONF-NETCONF started")
+LIGHTY_OK_START_MSG = "lighty.io and RESTCONF-NETCONF started"
 
 ODL_LOGIN = 'admin'
 ODL_PWD = 'admin'
diff --git a/tox.ini b/tox.ini
index 075341b0c..1f624c5ab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ setupdir = tests/
 [testenv]
 passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OLM_TIMER1 OLM_TIMER2
 setenv =
-#    USE_LIGHTY=True
+    USE_LIGHTY=True
     OLM_TIMER1=3000
     OLM_TIMER2=2000
 
@@ -60,8 +60,8 @@ 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
-#    USE_LIGHTY=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
 deps =
   -r{toxinidir}/tests/requirements.txt
   -r{toxinidir}/tests/test-requirements.txt
@@ -79,7 +79,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-#    USE_LIGHTY=True
+    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
@@ -91,8 +91,8 @@ depends = buildcontroller,build_karaf_tests121,sims121,testsPCE
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
-#    USE_LIGHTY=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf121
 commands =
@@ -112,7 +112,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-#    USE_LIGHTY=True
+    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
 commands =
@@ -124,8 +124,8 @@ depends = buildcontroller,build_karaf_tests221,sims221,tests71
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
-#    USE_LIGHTY=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
 commands =
@@ -137,7 +137,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-#    USE_LIGHTY=True
+    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
@@ -148,8 +148,8 @@ depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
-#    USE_LIGHTY=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
@@ -160,7 +160,7 @@ depends = buildcontroller
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY
 setenv =
-#    USE_LIGHTY=True
+    USE_LIGHTY=True
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
@@ -172,8 +172,8 @@ depends = buildcontroller,build_karaf_tests_hybrid,sims121,sims221,sims71,tests1
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
 setenv =
-#    USE_LIGHTY=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    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 =
@@ -185,8 +185,8 @@ depends = buildcontroller,build_karaf_tests221,sims221
 whitelist_externals = launch_tests.sh
 passenv = LAUNCHER USE_LIGHTY OLM_TIMER1 OLM_TIMER2 USE_ODL_RESTCONF_VERSION
 setenv =
-#    USE_LIGHTY=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf221
     INSTALL_TAPI=True
@@ -206,7 +206,7 @@ setenv =
     OLM_TIMER2=2000
     INSTALL_TAPI=True
     INSTALL_NBINOTIFICATIONS=True
-#    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
 
 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