diff options
| author | MotoKen <motokentsai@gmail.com> | 2011-12-27 14:44:11 +0800 |
|---|---|---|
| committer | MotoKen <motokentsai@gmail.com> | 2011-12-27 15:01:25 +0800 |
| commit | 5bdc35b11574439057cfbdee17cf83c40da2cea2 (patch) | |
| tree | 3acff3728483a7ced26e82780a6b574fdd2286d0 /nova/tests | |
| parent | cff2ddcbd532ed54d60dbfbdbb7720f4634487b9 (diff) | |
Adds EC2 ImportKeyPair API support.
Implements import_key_pair instead of import_public_key.
Change-Id: I256b76aeb4ff94030a58692bfd12b2d7c53ae461
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/ec2/test_cloud.py | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index 7487db4a6..aa07aae1e 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -1164,19 +1164,7 @@ class CloudTestCase(test.TestCase): self.assertTrue(filter(lambda k: k['keyName'] == 'test1', keys)) self.assertTrue(filter(lambda k: k['keyName'] == 'test2', keys)) - def test_import_public_key(self): - # test when user provides all values - result1 = self.cloud.import_public_key(self.context, - 'testimportkey1', - 'mytestpubkey', - 'mytestfprint') - self.assertTrue(result1) - keydata = db.key_pair_get(self.context, - self.context.user_id, - 'testimportkey1') - self.assertEqual('mytestpubkey', keydata['public_key']) - self.assertEqual('mytestfprint', keydata['fingerprint']) - # test when user omits fingerprint + def test_import_key_pair(self): pubkey_path = os.path.join(os.path.dirname(__file__), 'public_key') f = open(pubkey_path + '/dummy.pub', 'r') dummypub = f.readline().rstrip() @@ -1184,13 +1172,16 @@ class CloudTestCase(test.TestCase): f = open(pubkey_path + '/dummy.fingerprint', 'r') dummyfprint = f.readline().rstrip() f.close - result2 = self.cloud.import_public_key(self.context, - 'testimportkey2', - dummypub) - self.assertTrue(result2) + key_name = 'testimportkey' + public_key_material = base64.b64encode(dummypub) + result = self.cloud.import_key_pair(self.context, + key_name, + public_key_material) + self.assertEqual(result['keyName'], key_name) + self.assertEqual(result['keyFingerprint'], dummyfprint) keydata = db.key_pair_get(self.context, self.context.user_id, - 'testimportkey2') + key_name) self.assertEqual(dummypub, keydata['public_key']) self.assertEqual(dummyfprint, keydata['fingerprint']) |