tests pass

2 files changed, 12 insertions, 12 deletions

diff --git a/nova/api/openstack/contrib/keypairs.py b/nova/api/openstack/contrib/keypairs.py
index 8435494e1..d718846f1 100644
--- a/nova/api/openstack/contrib/keypairs.py
+++ b/nova/api/openstack/contrib/keypairs.py
@@ -46,29 +46,29 @@ class KeypairController(object):
         """
         Create or import keypair.
 
-        Sending key_name will generate a key and return private_key
+        Sending name will generate a key and return private_key
         and fingerprint.
 
         You can send a public_key to add an existing ssh key
 
         params: keypair object with:
-            key_name (required) - string
+            name (required) - string
             public_key (optional) - string
         """
 
         context = req.environ['nova.context']
         params = body['keypair']
-        key_name = params['key_name']
+        name = params['name']
 
-        # NOTE(ja): generation is slow, so shortcut invalid key_name exception
+        # NOTE(ja): generation is slow, so shortcut invalid name exception
         try:
-            db.key_pair_get(context, context.user_id, key_name)
-            raise exception.KeyPairExists(key_name=key_name)
+            db.key_pair_get(context, context.user_id, name)
+            raise exception.KeyPairExists(key_name=name)
         except exception.NotFound:
             pass
 
         keypair = {'user_id': context.user_id,
-                   'name': key_name}
+                   'name': name}
 
         # import if public_key is sent
         if 'public_key' in params:
@@ -107,7 +107,7 @@ class KeypairController(object):
         for key_pair in key_pairs:
             rval.append({'keypair': {
                 'name': key_pair['name'],
-                'key_name': key_pair['name'],
+                'public_key': key_pair['public_key'],
                 'fingerprint': key_pair['fingerprint'],
             }})
 
diff --git a/nova/tests/api/openstack/contrib/test_keypairs.py b/nova/tests/api/openstack/contrib/test_keypairs.py
index 1f6028e08..c9dc34d65 100644
--- a/nova/tests/api/openstack/contrib/test_keypairs.py
+++ b/nova/tests/api/openstack/contrib/test_keypairs.py
@@ -36,8 +36,8 @@ def db_key_pair_create(self, keypair):
     pass
 
 
-def db_key_pair_destroy(context, user_id, key_name):
-    if not (user_id and key_name):
+def db_key_pair_destroy(context, user_id, name):
+    if not (user_id and name):
         raise Exception()
 
 
@@ -65,7 +65,7 @@ class KeypairsTest(test.TestCase):
         self.assertEqual(res_dict, response)
 
     def test_keypair_create(self):
-        body = {'keypair': {'key_name': 'create_test'}}
+        body = {'keypair': {'name': 'create_test'}}
         req = webob.Request.blank('/v1.1/os-keypairs')
         req.method = 'POST'
         req.body = json.dumps(body)
@@ -77,7 +77,7 @@ class KeypairsTest(test.TestCase):
         self.assertTrue(len(res_dict['keypair']['private_key']) > 0)
 
     def test_keypair_import(self):
-        body = {'keypair': {'key_name': 'create_test',
+        body = {'keypair': {'name': 'create_test',
                             'public_key': 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBYIznAx9D7118Q1VKGpXy2HDiKyUTM8XcUuhQpo0srqb9rboUp4a9NmCwpWpeElDLuva707GOUnfaBAvHBwsRXyxHJjRaI6YQj2oLJwqvaSaWUbyT1vtryRqy6J3TecN0WINY71f4uymiMZP0wby4bKBcYnac8KiCIlvkEl0ETjkOGUq8OyWRmn7ljj5SESEUdBP0JnuTFKddWTU/wD6wydeJaUhBTqOlHn0kX1GyqoNTE1UEhcM5ZRWgfUZfTjVyDF2kGj3vJLCJtJ8LoGcj7YaN4uPg1rBle+izwE/tLonRrds+cev8p6krSSrxWOwBbHkXa6OciiJDvkRzJXzf'}}
         req = webob.Request.blank('/v1.1/os-keypairs')
         req.method = 'POST'