openstack/manila
Code Issues Proposed changes

Update tempest pin to latest commit ref

Browse Source 
Also updated invocation of DynamicCredentialsProvider to supply
necessary parameters.

Change-Id: Ie24bc69402964af3d756c1548aed86cc53c272c4
This commit is contained in:
Tom Barron 2017-02-02 11:02:20 -05:00
parent 65754aa153
commit 4cfdbea447
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ci/common.sh
View File

@ -1,6 +1,6 @@
# Environment variables # Environment variables
export MANILA_TEMPEST_COMMIT="c592707" # 2 Sept, 2016 - tempest 12.2.0 export MANILA_TEMPEST_COMMIT="4ce3779" # 10 Feb, 2017
# ---------------------------------------------- # ----------------------------------------------

34
manila_tempest_tests/tests/api/base.py
View File

@ -149,6 +149,26 @@ class BaseSharesTest(test.BaseTestCase):
"Microversion must be greater than or equal to '%s'." % "Microversion must be greater than or equal to '%s'." %
microversion) microversion)
@classmethod
def _get_dynamic_creds(cls, name, network_resources=None):
return dynamic_creds.DynamicCredentialProvider(
identity_version=CONF.identity.auth_version,
name=name,
network_resources=network_resources,
credentials_domain=CONF.auth.default_credentials_domain_name,
admin_role=CONF.identity.admin_role,
admin_creds=common_creds.get_configured_admin_credentials(),
identity_admin_domain_scope=CONF.identity.admin_domain_scope,
identity_admin_role=CONF.identity.admin_role,
extra_roles=None,
neutron_available=CONF.service_available.neutron,
create_networks=(
CONF.share.create_networks_when_multitenancy_enabled),
project_network_cidr=CONF.network.project_network_cidr,
project_network_mask_bits=CONF.network.project_network_mask_bits,
public_network_id=CONF.network.public_network_id,
resource_prefix=CONF.resources_prefix)
@classmethod @classmethod
def get_client_with_isolated_creds(cls, def get_client_with_isolated_creds(cls,
name=None, name=None,
@ -171,11 +191,7 @@ class BaseSharesTest(test.BaseTestCase):
name = name[0:32] name = name[0:32]
# Choose type of isolated creds # Choose type of isolated creds
ic = dynamic_creds.DynamicCredentialProvider( ic = cls._get_dynamic_creds(name)
identity_version=CONF.identity.auth_version,
name=name,
admin_role=CONF.identity.admin_role,
admin_creds=common_creds.get_configured_admin_credentials())
if "admin" in type_of_creds: if "admin" in type_of_creds:
creds = ic.get_admin_creds().credentials creds = ic.get_admin_creds().credentials
elif "alt" in type_of_creds: elif "alt" in type_of_creds:
@ -349,13 +365,7 @@ class BaseSharesTest(test.BaseTestCase):
# Create suitable network # Create suitable network
if net_id is None or subnet_id is None: if net_id is None or subnet_id is None:
ic = dynamic_creds.DynamicCredentialProvider( ic = cls._get_dynamic_creds(service_net_name)
identity_version=CONF.identity.auth_version,
name=service_net_name,
admin_role=CONF.identity.admin_role,
admin_creds=(
common_creds.
get_configured_admin_credentials()))
net_data = ic._create_network_resources(sc.tenant_id) net_data = ic._create_network_resources(sc.tenant_id)
network, subnet, router = net_data network, subnet, router = net_data
net_id = network["id"] net_id = network["id"]