Use lib version of data_utils in dynamic creds

As part of the pending library migration for the dynamic credentials
module we need to remove all dependencies on non-lib code. As part of
this effort, this patch changes all usages of tempest's lib data_utils
wrapper to just use the lib version directly. The tempest wrapper only
sets a common prefix for rand_name, so this switches all uses of
rand_name to do the same.

Change-Id: I231c4522501249b9d6854f6378e75a0f130aea1c
This commit is contained in:
Matthew Treinish 2016-10-07 16:36:46 -04:00
parent 00ab6be2a7
commit 0650aedecc
No known key found for this signature in database
GPG Key ID: FD12A0F214C9E177
2 changed files with 12 additions and 8 deletions

View File

@ -89,6 +89,7 @@ def get_credentials_provider(name, network_resources=None,
public_network_id=CONF.network.public_network_id,
create_networks=(CONF.auth.create_isolated_networks and not
CONF.baremetal.driver_enabled),
resource_prefix=CONF.resources_prefix,
**get_dynamic_provider_params())
else:
if CONF.auth.test_accounts_file:

View File

@ -18,9 +18,9 @@ import six
from tempest import clients
from tempest.common import cred_client
from tempest.common.utils import data_utils
from tempest import exceptions
from tempest.lib.common import cred_provider
from tempest.lib.common.utils import data_utils
from tempest.lib import exceptions as lib_exc
LOG = logging.getLogger(__name__)
@ -34,7 +34,7 @@ class DynamicCredentialProvider(cred_provider.CredentialProvider):
identity_admin_role='admin', extra_roles=None,
neutron_available=False, create_networks=True,
project_network_cidr=None, project_network_mask_bits=None,
public_network_id=None):
public_network_id=None, resource_prefix=None):
"""Creates credentials dynamically for tests
A credential provider that, based on an initial set of
@ -76,6 +76,7 @@ class DynamicCredentialProvider(cred_provider.CredentialProvider):
self.network_resources = network_resources
self._creds = {}
self.ports = []
self.resource_prefix = resource_prefix or ''
self.neutron_available = neutron_available
self.create_networks = create_networks
self.project_network_cidr = project_network_cidr
@ -152,7 +153,7 @@ class DynamicCredentialProvider(cred_provider.CredentialProvider):
"""
root = self.name
project_name = data_utils.rand_name(root)
project_name = data_utils.rand_name(root, prefix=self.resource_prefix)
project_desc = project_name + "-desc"
project = self.creds_client.create_project(
name=project_name, description=project_desc)
@ -161,7 +162,8 @@ class DynamicCredentialProvider(cred_provider.CredentialProvider):
# having the same ID in both makes it easier to match them and debug.
username = project_name
user_password = data_utils.rand_password()
email = data_utils.rand_name(root) + "@example.com"
email = data_utils.rand_name(
root, prefix=self.resource_prefix) + "@example.com"
user = self.creds_client.create_user(
username, user_password, project, email)
role_assigned = False
@ -226,17 +228,18 @@ class DynamicCredentialProvider(cred_provider.CredentialProvider):
elif self.network_resources['dhcp']:
raise exceptions.InvalidConfiguration('DHCP requires a subnet')
data_utils.rand_name_root = data_utils.rand_name(self.name)
rand_name_root = data_utils.rand_name(
self.name, prefix=self.resource_prefix)
if not self.network_resources or self.network_resources['network']:
network_name = data_utils.rand_name_root + "-network"
network_name = rand_name_root + "-network"
network = self._create_network(network_name, tenant_id)
try:
if not self.network_resources or self.network_resources['subnet']:
subnet_name = data_utils.rand_name_root + "-subnet"
subnet_name = rand_name_root + "-subnet"
subnet = self._create_subnet(subnet_name, tenant_id,
network['id'])
if not self.network_resources or self.network_resources['router']:
router_name = data_utils.rand_name_root + "-router"
router_name = rand_name_root + "-router"
router = self._create_router(router_name, tenant_id)
self._add_router_interface(router['id'], subnet['id'])
except Exception: