Temporarily disable Cinder volumes backup tests

[functest.git] / functest / opnfv_tests / openstack / tempest / tempest.py

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index a4fff47..4d5a0f5 100644 (file)
--- 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__)
 
@@ -46,17 +47,17 @@ class TempestCommon(singlevm.VmReady2):
         assert self.cloud
         assert self.project
         if self.orig_cloud.get_role("admin"):
-            role_name = "admin"
+            self.role_name = "admin"
         elif self.orig_cloud.get_role("Admin"):
-            role_name = "Admin"
+            self.role_name = "Admin"
         else:
             raise Exception("Cannot detect neither admin nor Admin")
         self.orig_cloud.grant_role(
-            role_name, user=self.project.user.id,
+            self.role_name, user=self.project.user.id,
             project=self.project.project.id,
             domain=self.project.domain.id)
         self.orig_cloud.grant_role(
-            role_name, user=self.project.user.id,
+            self.role_name, user=self.project.user.id,
             domain=self.project.domain.id)
         environ = dict(
             os.environ,
@@ -64,6 +65,11 @@ class TempestCommon(singlevm.VmReady2):
             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:
@@ -308,9 +314,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"""
@@ -377,12 +382,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)
 
@@ -409,7 +418,8 @@ class TempestCommon(singlevm.VmReady2):
             compute_cnt=compute_cnt,
             image_alt_id=self.image_alt.id,
             flavor_alt_id=self.flavor_alt.id,
-            domain_name=self.cloud.auth.get("project_domain_name", "Default"))
+            admin_role_name=self.role_name, cidr=self.cidr,
+            domain_id=self.project.domain.id)
         self.update_scenario_section()
         self.backup_tempest_config(self.conf_file, self.res_dir)