summaryrefslogtreecommitdiff
path: root/openstackclient/tests/functional/compute
diff options
context:
space:
mode:
authorStephen Finucane <sfinucan@redhat.com>2023-04-28 11:28:56 +0100
committerStephen Finucane <sfinucan@redhat.com>2023-05-02 12:18:52 +0100
commit2454636386d443473dedff1f07f8623108e87298 (patch)
tree204f54a811b80170e87941c68b3f942b39c8b2f7 /openstackclient/tests/functional/compute
parenta2f877f70c460769337fab5fd2d65cca0ba9091c (diff)
downloadpython-openstackclient-2454636386d443473dedff1f07f8623108e87298.tar.gz
compute: Generate SSH keypairs ourselves
Starting with the 2.92 microversion, nova will no longer generate SSH keys. Avoid breaking users by generating keypairs ourselves using the cryptography library, which was already an indirect dependency through openstacksdk. Change-Id: I3ad2732f70854ab72da0947f00847351dda23944 Implements: blueprint keypair-generation-removal
Diffstat (limited to 'openstackclient/tests/functional/compute')
-rw-r--r--openstackclient/tests/functional/compute/v2/test_keypair.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/openstackclient/tests/functional/compute/v2/test_keypair.py b/openstackclient/tests/functional/compute/v2/test_keypair.py
index 828d5dad..e1d12977 100644
--- a/openstackclient/tests/functional/compute/v2/test_keypair.py
+++ b/openstackclient/tests/functional/compute/v2/test_keypair.py
@@ -117,24 +117,28 @@ class KeypairTests(KeypairBase):
self.assertIsNotNone(cmd_output.get('user_id'))
self.assertIsNotNone(cmd_output.get('fingerprint'))
pk_content = f.read()
- self.assertInOutput('-----BEGIN RSA PRIVATE KEY-----', pk_content)
+ self.assertInOutput(
+ '-----BEGIN OPENSSH PRIVATE KEY-----', pk_content,
+ )
self.assertRegex(pk_content, "[0-9A-Za-z+/]+[=]{0,3}\n")
- self.assertInOutput('-----END RSA PRIVATE KEY-----', pk_content)
+ self.assertInOutput(
+ '-----END OPENSSH PRIVATE KEY-----', pk_content,
+ )
def test_keypair_create(self):
"""Test keypair create command.
Test steps:
1) Create keypair in setUp
- 2) Check RSA private key in output
+ 2) Check Ed25519 private key in output
3) Check for new keypair in keypairs list
"""
NewName = data_utils.rand_name('TestKeyPairCreated')
raw_output = self.openstack('keypair create ' + NewName)
self.addCleanup(self.openstack, 'keypair delete ' + NewName)
- self.assertInOutput('-----BEGIN RSA PRIVATE KEY-----', raw_output)
+ self.assertInOutput('-----BEGIN OPENSSH PRIVATE KEY-----', raw_output)
self.assertRegex(raw_output, "[0-9A-Za-z+/]+[=]{0,3}\n")
- self.assertInOutput('-----END RSA PRIVATE KEY-----', raw_output)
+ self.assertInOutput('-----END OPENSSH PRIVATE KEY-----', raw_output)
self.assertIn(NewName, self.keypair_list())
def test_keypair_delete_not_existing(self):