From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 11 Jul 2018 09:35:33 +0000 (+0200)
Subject: Update rally image name regex
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d3f4ac51cb1b3485e6d86b2d5d079456b0f056fd;p=functest.git

Update rally image name regex

The default value doesn't conform with our image names.
Else it downloads the image from internet which may be not possible
(offline testing, proxy or deployment l3 issues [1])

[1] https://build.opnfv.org/ci/view/functest/job/functest-apex-virtual-suite-master/113/console

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

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 686711f8d..eb3469112 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -19,6 +19,7 @@ import shutil
 import subprocess
 import time
 
+from six.moves import configparser
 from xtesting.core import testcase
 import yaml
 
@@ -257,6 +258,15 @@ class TempestCommon(singlevm.VmReady1):
         subprocess.Popen(cmd, stdout=subprocess.PIPE,
                          stderr=subprocess.STDOUT)
 
+    def update_rally_regex(self, rally_conf='/etc/rally/rally.conf'):
+        """Set image name as tempest img_name_regex"""
+        rconfig = configparser.RawConfigParser()
+        rconfig.read(rally_conf)
+        rconfig.set('tempest', 'img_name_regex', '^{}$'.format(
+            self.image.name))
+        with open(rally_conf, 'wb') as config_file:
+            rconfig.write(config_file)
+
     def configure(self, **kwargs):  # pylint: disable=unused-argument
         """
         Create all openstack resources for tempest-based testcases and write
@@ -285,6 +295,7 @@ class TempestCommon(singlevm.VmReady1):
         self.start_time = time.time()
         try:
             super(TempestCommon, self).run(**kwargs)
+            self.update_rally_regex()
             self.configure(**kwargs)
             self.generate_test_list()
             self.apply_tempest_blacklist()
diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index 3dd2de6e5..075aa1eec 100644
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/openstack/tempest/test_tempest.py
@@ -252,7 +252,8 @@ class OSTempestTesting(unittest.TestCase):
             self._test_run(testcase.TestCase.EX_RUN_ERROR)
 
     def test_run(self):
-        with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
+        with mock.patch.object(self.tempestcommon, 'update_rally_regex'), \
+                mock.patch.object(self.tempestcommon, 'generate_test_list'), \
                 mock.patch.object(self.tempestcommon,
                                   'apply_tempest_blacklist'), \
                 mock.patch.object(self.tempestcommon, 'run_verifier_tests'), \