openstack
/
tempest
Code Issues Proposed changes

Merge "Pass clients to compute base's create_test_server"

This commit is contained in:
Zuul 2020-04-13 04:43:47 +00:00 committed by Gerrit Code Review
parent 91f0e00882 68f1e5e8cd
commit fe28c849d8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tempest/api/compute/base.py
View File

@ -227,7 +227,7 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
@classmethod @classmethod
def create_test_server(cls, validatable=False, volume_backed=False, def create_test_server(cls, validatable=False, volume_backed=False,
validation_resources=None, **kwargs): validation_resources=None, clients=None, **kwargs):
"""Wrapper utility that returns a test server. """Wrapper utility that returns a test server.
This wrapper utility calls the common create test server and This wrapper utility calls the common create test server and
@ -239,6 +239,7 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
:param volume_backed: Whether the instance is volume backed or not. :param volume_backed: Whether the instance is volume backed or not.
:param validation_resources: Dictionary of validation resources as :param validation_resources: Dictionary of validation resources as
returned by `get_class_validation_resources`. returned by `get_class_validation_resources`.
:param clients: Client manager, defaults to os_primary.
:param kwargs: Extra arguments are passed down to the :param kwargs: Extra arguments are passed down to the
`compute.create_test_server` call. `compute.create_test_server` call.
""" """
@ -255,8 +256,11 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
not tenant_network): not tenant_network):
kwargs['networks'] = 'none' kwargs['networks'] = 'none'
if clients is None:
clients = cls.os_primary
body, servers = compute.create_test_server( body, servers = compute.create_test_server(
cls.os_primary, clients,
validatable, validatable,
validation_resources=validation_resources, validation_resources=validation_resources,
tenant_network=tenant_network, tenant_network=tenant_network,
@ -267,11 +271,11 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
# and then wait for all # and then wait for all
for server in servers: for server in servers:
cls.addClassResourceCleanup(waiters.wait_for_server_termination, cls.addClassResourceCleanup(waiters.wait_for_server_termination,
cls.servers_client, server['id']) clients.servers_client, server['id'])
for server in servers: for server in servers:
cls.addClassResourceCleanup( cls.addClassResourceCleanup(
test_utils.call_and_ignore_notfound_exc, test_utils.call_and_ignore_notfound_exc,
cls.servers_client.delete_server, server['id']) clients.servers_client.delete_server, server['id'])
return body return body