From b883b259fc4c2b651fd27ac0a392f8918b77489a Mon Sep 17 00:00:00 2001
From: "Mauro S. M. Rodrigues" <maurosr@linux.vnet.ibm.com>
Date: Tue, 12 Mar 2013 10:09:00 -0400
Subject: Check keypair destroy result operation

This checks the result of delete operation over keypairs to see if it
affected any row (this is what delete returns), if not raises
KeyPairNotFoundException.

Also adds tests for keypair db api.

Fix bug 1086980

Change-Id: I7e822c0661c563db01040ae2d57aacfe677d72b0
---
 nova/db/sqlalchemy/api.py | 10 ++++++----
 nova/tests/test_db_api.py | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 68657ffb4..a668bfc4c 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1937,10 +1937,12 @@ def key_pair_create(context, values):
 @require_context
 def key_pair_destroy(context, user_id, name):
     nova.context.authorize_user_context(context, user_id)
-    model_query(context, models.KeyPair).\
-             filter_by(user_id=user_id).\
-             filter_by(name=name).\
-             delete()
+    result = model_query(context, models.KeyPair).\
+                         filter_by(user_id=user_id).\
+                         filter_by(name=name).\
+                         delete()
+    if not result:
+        raise exception.KeypairNotFound(user_id=user_id, name=name)
 
 
 @require_context
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index bb6b3817b..11435ab5a 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -796,6 +796,51 @@ class DbApiTestCase(DbTestCase):
         self.assertEqual('schedule', event['event'])
         self.assertEqual(start_time, event['start_time'])
 
+    def test_add_key_pair(self, name=None):
+        """Check if keypair creation work as expected."""
+        keypair = {
+            'user_id': self.user_id,
+            'name': name or 'test-keypair',
+            'fingerprint': '15:b0:f8:b3:f9:48:63:71:cf:7b:5b:38:6d:44:2d:4a',
+            'private_key': 'private_key_value',
+            'public_key': 'public_key_value'
+        }
+        result_key = db.key_pair_create(context.get_admin_context(), keypair)
+        for label in keypair:
+            self.assertEqual(keypair[label], result_key[label])
+
+    def test_key_pair_destroy(self):
+        """Check if key pair deletion works as expected."""
+        keypair_name = 'test-delete-keypair'
+        self.test_add_key_pair(name=keypair_name)
+        db.key_pair_destroy(context.get_admin_context(), self.user_id,
+                            keypair_name)
+        self.assertRaises(exception.KeypairNotFound, db.key_pair_get,
+                          context.get_admin_context(), self.user_id,
+                          keypair_name)
+
+    def test_key_pair_get(self):
+        """Test if a previously created keypair can be found."""
+        keypair_name = 'test-get-keypair'
+        self.test_add_key_pair(name=keypair_name)
+        result = db.key_pair_get(context.get_admin_context(), self.user_id,
+                                 keypair_name)
+        self.assertEqual(result.name, keypair_name)
+
+    def test_key_pair_get_all_by_user(self):
+        self.assertTrue(isinstance(db.key_pair_get_all_by_user(
+                context.get_admin_context(), self.user_id), list))
+
+    def test_delete_non_existent_key_pair(self):
+        self.assertRaises(exception.KeypairNotFound, db.key_pair_destroy,
+                          context.get_admin_context(), self.user_id,
+                          'non-existent-keypair')
+
+    def test_get_non_existent_key_pair(self):
+        self.assertRaises(exception.KeypairNotFound, db.key_pair_get,
+                          context.get_admin_context(), self.user_id,
+                          'invalid-key')
+
     def test_dns_registration(self):
         domain1 = 'test.domain.one'
         domain2 = 'test.domain.two'
-- 
cgit