X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Ftempest%2Ftempest.py;h=9d788de8c82ab384d6f6df063b9688283419fed4;hb=refs%2Fchanges%2F01%2F66501%2F1;hp=d903411abe140c5e14d826a398b59c9d0fb5f1f9;hpb=11d28aaf2e726859b59b7511d64dc4dd4b422e1e;p=functest.git

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index d903411ab..9d788de8c 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -27,6 +27,7 @@ from functest.core import singlevm
 from functest.opnfv_tests.openstack.tempest import conf_utils
 from functest.utils import config
 from functest.utils import env
+from functest.utils import functest_utils
 
 LOGGER = logging.getLogger(__name__)
 
@@ -58,23 +59,10 @@ class TempestCommon(singlevm.VmReady2):
         self.orig_cloud.grant_role(
             self.role_name, user=self.project.user.id,
             domain=self.project.domain.id)
-        environ = dict(
-            os.environ,
-            OS_USERNAME=self.project.user.name,
-            OS_PROJECT_NAME=self.project.project.name,
-            OS_PROJECT_ID=self.project.project.id,
-            OS_PASSWORD=self.project.password)
-        self.deployment_id = conf_utils.create_rally_deployment(
-            environ=environ)
-        if not self.deployment_id:
-            raise Exception("Deployment create failed")
-        self.verifier_id = conf_utils.create_verifier()
-        if not self.verifier_id:
-            raise Exception("Verifier create failed")
-        self.verifier_repo_dir = conf_utils.get_verifier_repo_dir(
-            self.verifier_id)
-        self.deployment_dir = conf_utils.get_verifier_deployment_dir(
-            self.verifier_id, self.deployment_id)
+        self.deployment_id = None
+        self.verifier_id = None
+        self.verifier_repo_dir = None
+        self.deployment_dir = None
         self.verification_id = None
         self.res_dir = os.path.join(
             getattr(config.CONF, 'dir_results'), self.case_name)
@@ -308,9 +296,8 @@ class TempestCommon(singlevm.VmReady2):
         html_file = os.path.join(self.res_dir,
                                  "tempest-report.html")
         cmd = ["rally", "verify", "report", "--type", "html", "--uuid",
-               self.verification_id, "--to", html_file]
-        subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                         stderr=subprocess.STDOUT)
+               self.verification_id, "--to", str(html_file)]
+        subprocess.check_output(cmd)
 
     def update_rally_regex(self, rally_conf='/etc/rally/rally.conf'):
         """Set image name as tempest img_name_regex"""
@@ -342,6 +329,8 @@ class TempestCommon(singlevm.VmReady2):
             os.makedirs(self.res_dir)
         rconfig = configparser.RawConfigParser()
         rconfig.read(rally_conf)
+        rconfig.set('DEFAULT', 'debug', True)
+        rconfig.set('DEFAULT', 'use_stderr', False)
         rconfig.set('DEFAULT', 'log-file', 'rally.log')
         rconfig.set('DEFAULT', 'log_dir', self.res_dir)
         with open(rally_conf, 'wb') as config_file:
@@ -356,6 +345,10 @@ class TempestCommon(singlevm.VmReady2):
             rconfig.remove_option('openstack', 'img_name_regex')
         if rconfig.has_option('openstack', 'swift_operator_role'):
             rconfig.remove_option('openstack', 'swift_operator_role')
+        if rconfig.has_option('DEFAULT', 'use_stderr'):
+            rconfig.remove_option('DEFAULT', 'use_stderr')
+        if rconfig.has_option('DEFAULT', 'debug'):
+            rconfig.remove_option('DEFAULT', 'debug')
         if rconfig.has_option('DEFAULT', 'log-file'):
             rconfig.remove_option('DEFAULT', 'log-file')
         if rconfig.has_option('DEFAULT', 'log_dir'):
@@ -377,12 +370,16 @@ class TempestCommon(singlevm.VmReady2):
             config.CONF, '{}_image_format'.format(self.case_name),
             self.image_format))
         extra_properties = self.extra_properties.copy()
+        if env.get('IMAGE_PROPERTIES'):
+            extra_properties.update(
+                functest_utils.convert_ini_to_dict(
+                    env.get('IMAGE_PROPERTIES')))
         extra_properties.update(
             getattr(config.CONF, '{}_extra_properties'.format(
                 self.case_name), {}))
         rconfig.set(
             'scenario', 'img_properties',
-            conf_utils.convert_dict_to_ini(extra_properties))
+            functest_utils.convert_dict_to_ini(extra_properties))
         with open(self.conf_file, 'wb') as config_file:
             rconfig.write(config_file)
 
@@ -393,7 +390,30 @@ class TempestCommon(singlevm.VmReady2):
         """
         if not os.path.exists(self.res_dir):
             os.makedirs(self.res_dir)
-        compute_cnt = len(self.cloud.list_hypervisors())
+        environ = dict(
+            os.environ,
+            OS_USERNAME=self.project.user.name,
+            OS_PROJECT_NAME=self.project.project.name,
+            OS_PROJECT_ID=self.project.project.id,
+            OS_PASSWORD=self.project.password)
+        try:
+            del environ['OS_TENANT_NAME']
+            del environ['OS_TENANT_ID']
+        except Exception:  # pylint: disable=broad-except
+            pass
+        self.deployment_id = conf_utils.create_rally_deployment(
+            environ=environ)
+        if not self.deployment_id:
+            raise Exception("Deployment create failed")
+        self.verifier_id = conf_utils.create_verifier()
+        if not self.verifier_id:
+            raise Exception("Verifier create failed")
+        self.verifier_repo_dir = conf_utils.get_verifier_repo_dir(
+            self.verifier_id)
+        self.deployment_dir = conf_utils.get_verifier_deployment_dir(
+            self.verifier_id, self.deployment_id)
+
+        compute_cnt = len(self.orig_cloud.list_hypervisors())
 
         self.image_alt = self.publish_image_alt()
         self.flavor_alt = self.create_flavor_alt()