Merge "[Tempest] Bump tempest version"
diff --git a/manila_tempest_tests/tests/api/base.py b/manila_tempest_tests/tests/api/base.py
index ef409f4..cd16c60 100644
--- a/manila_tempest_tests/tests/api/base.py
+++ b/manila_tempest_tests/tests/api/base.py
@@ -175,8 +175,7 @@
identity_version=CONF.identity.auth_version,
name=name,
admin_role=CONF.identity.admin_role,
- admin_creds=common_creds.get_configured_credentials(
- 'identity_admin'))
+ admin_creds=common_creds.get_configured_admin_credentials())
if "admin" in type_of_creds:
creds = ic.get_admin_creds()
elif "alt" in type_of_creds:
@@ -315,8 +314,8 @@
identity_version=CONF.identity.auth_version,
name=service_net_name,
admin_role=CONF.identity.admin_role,
- admin_creds=common_creds.get_configured_credentials(
- 'identity_admin'))
+ admin_creds=(
+ common_creds.get_configured_admin_credentials()))
net_data = ic._create_network_resources(sc.tenant_id)
network, subnet, router = net_data
net_id = network["id"]
diff --git a/manila_tempest_tests/tests/scenario/test_share_basic_ops.py b/manila_tempest_tests/tests/scenario/test_share_basic_ops.py
index ef6fc24..261a886 100644
--- a/manila_tempest_tests/tests/scenario/test_share_basic_ops.py
+++ b/manila_tempest_tests/tests/scenario/test_share_basic_ops.py
@@ -16,6 +16,7 @@
from oslo_log import log as logging
from tempest import config # noqa
from tempest.lib.common.utils import data_utils
+from tempest.lib.common.utils import test_utils
from tempest.lib import exceptions
from tempest import test # noqa
@@ -83,7 +84,7 @@
# Obtain a floating IP
floating_ip = (self.compute_floating_ips_client.create_floating_ip()
['floating_ip'])
- self.addCleanup(self.delete_wrapper,
+ self.addCleanup(test_utils.call_and_ignore_notfound_exc,
self.compute_floating_ips_client.delete_floating_ip,
floating_ip['id'])
# Attach a floating IP