Print Test API links in console

It adds TEST_DB_EXT_URL to print the right links in case of NAT or SSH
port forwardings.

Change-Id: If85b00de7325909facc903fba13a3fd59a1e705f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 384308c4a5af0a66ff9e78de17ace94ab7d1d51f)

diff --git a/xtesting/core/testcase.py b/xtesting/core/testcase.py
index 386c9d8..d10fc37 100644 (file)
--- a/xtesting/core/testcase.py
+++ b/xtesting/core/testcase.py
@@ -232,8 +232,14 @@ class TestCase(object):
                 url, data=json.dumps(data, sort_keys=True),
                 headers=self._headers)
             req.raise_for_status()
-            self.__logger.info(
-                "The results were successfully pushed to DB")
+            if urllib.parse.urlparse(url).scheme != "file":
+                res_url = req.json()["href"]
+                if env.get('TEST_DB_EXT_URL'):
+                    res_url = res_url.replace(
+                        env.get('TEST_DB_URL'), env.get('TEST_DB_EXT_URL'))
+                self.__logger.info(
+                    "The results were successfully pushed to DB: \n\n%s\n",
+                    res_url)
         except AssertionError:
             self.__logger.exception(
                 "Please run test before publishing the results")

diff --git a/xtesting/tests/unit/core/test_testcase.py b/xtesting/tests/unit/core/test_testcase.py
index 3dbbac2..7306214 100644 (file)
--- a/xtesting/tests/unit/core/test_testcase.py
+++ b/xtesting/tests/unit/core/test_testcase.py
@@ -58,6 +58,7 @@ class TestCaseTesting(unittest.TestCase):
         self.test.result = 100
         self.test.details = {"Hello": "World"}
         os.environ['TEST_DB_URL'] = TestCaseTesting._test_db_url
+        os.environ['TEST_DB_EXT_URL'] = TestCaseTesting._test_db_url
         os.environ['INSTALLER_TYPE'] = "installer_type"
         os.environ['DEPLOY_SCENARIO'] = "scenario"
         os.environ['NODE_NAME'] = "node_name"

diff --git a/xtesting/utils/env.py b/xtesting/utils/env.py
index c781b84..dde6778 100644 (file)
--- a/xtesting/utils/env.py
+++ b/xtesting/utils/env.py
@@ -20,6 +20,7 @@ INPUTS = {
     'BUILD_TAG': None,
     'NODE_NAME': None,
     'TEST_DB_URL': 'http://testresults.opnfv.org/test/api/v1/results',
+    'TEST_DB_EXT_URL': None,
     'ENERGY_RECORDER_API_URL': 'http://energy.opnfv.fr/resources',
     'ENERGY_RECORDER_API_USER': None,
     'ENERGY_RECORDER_API_PASSWORD': None,