File support-older-tempest-func.patch of Package openstack-manila
Index: manila-2.0.1.dev46/manila_tempest_tests/tests/api/base.py
===================================================================
--- manila-2.0.1.dev46.orig/manila_tempest_tests/tests/api/base.py
+++ manila-2.0.1.dev46/manila_tempest_tests/tests/api/base.py
@@ -175,13 +175,14 @@ class BaseSharesTest(test.BaseTestCase):
identity_version=CONF.identity.auth_version,
name=name,
admin_role=CONF.identity.admin_role,
- admin_creds=common_creds.get_configured_admin_credentials())
+ admin_creds=common_creds.get_configured_credentials(
+ 'identity_admin'))
if "admin" in type_of_creds:
- creds = ic.get_admin_creds().credentials
+ creds = ic.get_admin_creds()
elif "alt" in type_of_creds:
- creds = ic.get_alt_creds().credentials
+ creds = ic.get_alt_creds()
else:
- creds = ic.get_credentials(type_of_creds).credentials
+ creds = ic.get_credentials(type_of_creds)
ic.type_of_creds = type_of_creds
# create client with isolated creds
@@ -315,7 +316,8 @@ class BaseSharesTest(test.BaseTestCase):
name=service_net_name,
admin_role=CONF.identity.admin_role,
admin_creds=(
- common_creds.get_configured_admin_credentials()))
+ common_creds.get_configured_credentials(
+ 'identity_admin')))
net_data = ic._create_network_resources(sc.tenant_id)
network, subnet, router = net_data
net_id = network["id"]