Updated Branches: refs/heads/trunk 99bd8739a -> 5e77186bb
LIBCLOUD-415 try fix keypair delete * add tests for delete keypair Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7fc13a4a Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7fc13a4a Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7fc13a4a Branch: refs/heads/trunk Commit: 7fc13a4a87e1c69c66d53c446ec963ef07fb8519 Parents: 99bd873 Author: gigimon <[email protected]> Authored: Wed Oct 23 09:56:51 2013 +0300 Committer: Tomaz Muraus <[email protected]> Committed: Wed Oct 23 12:56:01 2013 +0200 ---------------------------------------------------------------------- libcloud/compute/drivers/ec2.py | 2 +- libcloud/test/compute/test_ec2.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/7fc13a4a/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index c928ec7..b4f414c 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -881,7 +881,7 @@ class BaseEC2NodeDriver(NodeDriver): """ params = { 'Action': 'DeleteKeyPair', - 'KeyName.1': keypair + 'KeyName': keypair } result = self.connection.request(self.path, params=params).object element = findtext(element=result, xpath='return', http://git-wip-us.apache.org/repos/asf/libcloud/blob/7fc13a4a/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 260268b..785af5c 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -380,6 +380,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): self.assertEqual(keypair2['keyFingerprint'], null_fingerprint) def ex_delete_keypair(self): + resp = self.driver.ex_delete_keypair('testkey') self.assertTrue(resp) @@ -834,6 +835,11 @@ class EC2MockHttp(MockHttpTestCase): return (httplib.OK, body, {}, httplib.responses[httplib.OK]) def _DeleteKeypair(self, method, url, body, headers): + + url = url[2:] + params = dict(parse_qsl(url)) + self.assertEqual(params['KeyPair'], 'testkey') + body = self.fixtures.load('delete_keypair.xml') return (httplib.OK, body, {}, httplib.responses[httplib.OK])
