really delete key pair

This commit is contained in:
Konstantinos Koukopoulos 2014-02-24 13:38:46 +02:00
parent 38fa8de4b4
commit 72ae98128c
2 changed files with 6 additions and 4 deletions

View File

@ -176,9 +176,9 @@ class KeyPairBackend(object):
return keypair
def delete_key_pair(self, name):
keypair = self.keypairs.pop(name)
keypair['name'] = name
return keypair
if name in self.keypairs:
self.keypairs.pop(name)
return True
def describe_key_pairs(self, filter_names=None):
results = []

View File

@ -18,7 +18,9 @@ class KeyPairs(BaseResponse):
return template.render(**keypair)
def delete_key_pair(self):
return Template(DELETE_KEY_PAIR_RESPONSE).render(success="true")
name = self.querystring.get('KeyName')[0]
success = str(ec2_backend.delete_key_pair(name)).lower()
return Template(DELETE_KEY_PAIR_RESPONSE).render(success=success)
def describe_key_pairs(self):
template = Template(DESCRIBE_KEY_PAIRS_RESPONSE)