openstack
/
heat
Code Issues Proposed changes

Merge "Use correct argument name for setting Nova KeyPair key type"

This commit is contained in:
Zuul 2021-09-17 13:21:04 +00:00 committed by Gerrit Code Review
parent 28a1113dff 0f0508821f
commit 7676bf536c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/resources/openstack/nova/keypair.py
View File

@ -172,7 +172,7 @@ class KeyPair(resource.Resource):
}
if key_type:
create_kwargs[self.KEY_TYPE] = key_type
create_kwargs['key_type'] = key_type
if user_id:
create_kwargs['user_id'] = user_id

4
heat/tests/openstack/nova/test_keypair.py
View File

@ -112,7 +112,7 @@ class NovaKeyPairTest(common.HeatTestCase):
self.assertEqual((tp_test.CREATE, tp_test.COMPLETE), tp_test.state)
self.assertEqual(tp_test.resource_id, created_key.name)
self.fake_keypairs.create.assert_called_once_with(
name=key_name, public_key=None, type='ssh')
name=key_name, public_key=None, key_type='ssh')
self.cp_mock.assert_called_once_with()
def test_create_key_with_user_id(self):
@ -140,7 +140,7 @@ class NovaKeyPairTest(common.HeatTestCase):
self.assertEqual(tp_test.resource_id, created_key.name)
self.fake_keypairs.create.assert_called_once_with(
name=key_name, public_key=None, user_id='userA_ID',
type='x509')
key_type='x509')
self.cp_mock.assert_called_once_with()
def test_create_key_empty_name(self):