From 713978756ce5ba29f444eec6478ffa177c85f232 Mon Sep 17 00:00:00 2001
From: "Dave Walker (Daviey)" <DaveWalker@ubuntu.com>
Date: Sat, 21 May 2011 13:00:22 +0100
Subject: [PATCH 1/2] Added myself to Authors

---
 Authors | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Authors b/Authors
index 6741c81f..e7bddd21 100644
--- a/Authors
+++ b/Authors
@@ -17,6 +17,7 @@ Christian Berendt <berendt@b1-systems.de>
 Chuck Short <zulcss@ubuntu.com>
 Cory Wright <corywright@gmail.com>
 Dan Prince <dan.prince@rackspace.com>
+Dave Walker <DaveWalker@ubuntu.com>
 David Pravec <David.Pravec@danix.org>
 Dean Troyer <dtroyer@gmail.com>
 Devin Carlen <devin.carlen@gmail.com>

From 1eb1bde49694ff143e9948dcc558a472285123a1 Mon Sep 17 00:00:00 2001
From: "Dave Walker (Daviey)" <DaveWalker@ubuntu.com>
Date: Mon, 23 May 2011 22:15:10 +0100
Subject: [PATCH 2/2] Added test case for attempting to create a duplicate
 keypair

---
 nova/tests/test_api.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py
index 97f401b8..7c0331ef 100644
--- a/nova/tests/test_api.py
+++ b/nova/tests/test_api.py
@@ -224,6 +224,29 @@ class ApiEc2TestCase(test.TestCase):
         self.manager.delete_project(project)
         self.manager.delete_user(user)
 
+    def test_create_duplicate_key_pair(self):
+        """Test that, after successfully generating a keypair,
+        requesting a second keypair with the same name fails sanely"""
+        self.expect_http()
+        self.mox.ReplayAll()
+        keyname = "".join(random.choice("sdiuisudfsdcnpaqwertasd") \
+                          for x in range(random.randint(4, 8)))
+        user = self.manager.create_user('fake', 'fake', 'fake')
+        project = self.manager.create_project('fake', 'fake', 'fake')
+        # NOTE(vish): create depends on pool, so call helper directly
+        self.ec2.create_key_pair('test')
+
+        try:
+            self.ec2.create_key_pair('test')
+        except EC2ResponseError, e:
+            if e.code == 'KeyPairExists':
+                pass
+            else:
+                self.fail("Unexpected EC2ResponseError: %s "
+                          "(expected KeyPairExists)" % e.code)
+        else:
+            self.fail('Exception not raised.')
+
     def test_get_all_security_groups(self):
         """Test that we can retrieve security groups"""
         self.expect_http()