refine _get_isolated_creds
when exceptions.Duplicate is thrown in _get_isolated_creds, it
should be handled as the following:
1. reuse the existing tenant or user if it's allowed.
2. regenerate tenant name or user name, and try to create it again
until it's successful, shouldn't just raise the exception.
Change-Id: I69c4026aa4c32d4822342da0ac3f7243c0db6fd4
diff --git a/tempest/tests/compute/base.py b/tempest/tests/compute/base.py
index 3b2026e..eb30d81 100644
--- a/tempest/tests/compute/base.py
+++ b/tempest/tests/compute/base.py
@@ -96,47 +96,45 @@
operate in an isolated tenant container.
"""
admin_client = cls._get_identity_admin_client()
- rand_name_root = rand_name(cls.__name__)
- if cls.isolated_creds:
- # Main user already created. Create the alt one...
- rand_name_root += '-alt'
- username = rand_name_root + "-user"
- email = rand_name_root + "@example.com"
- tenant_name = rand_name_root + "-tenant"
- tenant_desc = tenant_name + "-desc"
password = "pass"
- try:
- resp, tenant = admin_client.create_tenant(name=tenant_name,
- description=tenant_desc)
- except exceptions.Duplicate:
- if cls.config.compute.allow_tenant_reuse:
- tenant = admin_client.get_tenant_by_name(tenant_name)
- LOG.info('Re-using existing tenant %s' % tenant)
- else:
- msg = ('Unable to create isolated tenant %s because ' +
- 'it already exists. If this is related to a ' +
- 'previous test failure, try using ' +
- 'allow_tenant_reuse in tempest.conf') % tenant_name
- raise exceptions.Duplicate(msg)
+ while True:
+ try:
+ rand_name_root = rand_name(cls.__name__)
+ if cls.isolated_creds:
+ # Main user already created. Create the alt one...
+ rand_name_root += '-alt'
+ tenant_name = rand_name_root + "-tenant"
+ tenant_desc = tenant_name + "-desc"
- try:
- resp, user = admin_client.create_user(username,
- password,
- tenant['id'],
- email)
- except exceptions.Duplicate:
- if cls.config.compute.allow_tenant_reuse:
- user = admin_client.get_user_by_username(tenant['id'],
- username)
- LOG.info('Re-using existing user %s' % user)
- else:
- msg = ('Unable to create isolated user %s because ' +
- 'it already exists. If this is related to a ' +
- 'previous test failure, try using ' +
- 'allow_tenant_reuse in tempest.conf') % tenant_name
- raise exceptions.Duplicate(msg)
+ resp, tenant = admin_client.create_tenant(
+ name=tenant_name, description=tenant_desc)
+ break
+ except exceptions.Duplicate:
+ if cls.config.compute.allow_tenant_reuse:
+ tenant = admin_client.get_tenant_by_name(tenant_name)
+ LOG.info('Re-using existing tenant %s', tenant)
+ break
+ while True:
+ try:
+ rand_name_root = rand_name(cls.__name__)
+ if cls.isolated_creds:
+ # Main user already created. Create the alt one...
+ rand_name_root += '-alt'
+ username = rand_name_root + "-user"
+ email = rand_name_root + "@example.com"
+ resp, user = admin_client.create_user(username,
+ password,
+ tenant['id'],
+ email)
+ break
+ except exceptions.Duplicate:
+ if cls.config.compute.allow_tenant_reuse:
+ user = admin_client.get_user_by_username(tenant['id'],
+ username)
+ LOG.info('Re-using existing user %s', user)
+ break
# Store the complete creds (including UUID ids...) for later
# but return just the username, tenant_name, password tuple
# that the various clients will use.