aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py2
-rw-r--r--functest/opnfv_tests/vnf/ims/heat_ims.py3
2 files changed, 5 insertions, 0 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 338fa51ca..bf1a193b6 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -216,6 +216,8 @@ def configure_tempest_update_params(
rconfig.set('identity-feature-enabled', 'api_v2', False)
else:
auth_version = 'v2'
+ if env.get("NEW_USER_ROLE").lower() != "member":
+ rconfig.set('auth', 'tempest_roles', env.get("NEW_USER_ROLE"))
rconfig.set('identity', 'auth_version', auth_version)
rconfig.set(
'validation', 'ssh_timeout',
diff --git a/functest/opnfv_tests/vnf/ims/heat_ims.py b/functest/opnfv_tests/vnf/ims/heat_ims.py
index 7ad1e96bf..3d32b889d 100644
--- a/functest/opnfv_tests/vnf/ims/heat_ims.py
+++ b/functest/opnfv_tests/vnf/ims/heat_ims.py
@@ -217,6 +217,9 @@ class HeatIms(singlevm.VmReady2):
try:
if self.stack:
self.cloud.delete_stack(self.stack.id, wait=True)
+ except TypeError:
+ # shade raises TypeError exceptions when checking stack status
+ pass
except Exception: # pylint: disable=broad-except
self.__logger.exception("Cannot clean stack ressources")
super(HeatIms, self).clean()