openstack
/
tempest
Code Issues Proposed changes

Merge "Allow kwargs in create_keypair"

This commit is contained in:
Zuul 2020-11-28 04:27:33 +00:00 committed by Gerrit Code Review
parent 7d9b50a810 30b4d5335a
commit c02c2846ed
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tempest/scenario/manager.py
View File

@ -160,7 +160,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
client.delete_port, port['id'])
return port
def create_keypair(self, client=None):
def create_keypair(self, client=None, **kwargs):
"""Creates keypair
Keypair is a public key of OpenSSH key pair used for accessing
@ -170,10 +170,11 @@ class ScenarioTest(tempest.test.BaseTestCase):
"""
if not client:
client = self.keypairs_client
name = data_utils.rand_name(self.__class__.__name__)
if not kwargs.get('name'):
kwargs['name'] = data_utils.rand_name(self.__class__.__name__)
# We don't need to create a keypair by pubkey in scenario
body = client.create_keypair(name=name)
self.addCleanup(client.delete_keypair, name)
body = client.create_keypair(**kwargs)
self.addCleanup(client.delete_keypair, kwargs['name'])
return body['keypair']
def create_server(self, name=None, image_id=None, flavor=None,