You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/10/23 13:01:50 UTC
[1/2] git commit: LIBCLOUD-415 try fix keypair delete * add tests for
delete keypair
Updated Branches:
refs/heads/trunk 99bd8739a -> 5e77186bb
LIBCLOUD-415 try fix keypair delete * add tests for delete keypair
Signed-off-by: Tomaz Muraus <to...@apache.org>
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 <gi...@gmail.com>
Authored: Wed Oct 23 09:56:51 2013 +0300
Committer: Tomaz Muraus <to...@apache.org>
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])
[2/2] git commit: Remove blank lines, update changes.
Posted by to...@apache.org.
Remove blank lines, update changes.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/5e77186b
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5e77186b
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5e77186b
Branch: refs/heads/trunk
Commit: 5e77186bb52894899f68d8cb1b03fc2dd083a837
Parents: 7fc13a4
Author: Tomaz Muraus <to...@apache.org>
Authored: Wed Oct 23 13:00:32 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Wed Oct 23 13:00:32 2013 +0200
----------------------------------------------------------------------
CHANGES | 7 +++++++
libcloud/test/compute/test_ec2.py | 2 --
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/5e77186b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e17cf77..3ecd2f1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,12 @@
-*- coding: utf-8 -*-
+Changes with Apache Libcloud in development
+
+ *) Compute
+
+ - Fix ex_delete_keypair method in the EC2 driver. (LIBCLOUD-415)
+ [Oleg Suharev]
+
Changes with Apache Libcloud 0.14.0-beta2
*) Compute
http://git-wip-us.apache.org/repos/asf/libcloud/blob/5e77186b/libcloud/test/compute/test_ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py
index 785af5c..687d62e 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -380,7 +380,6 @@ 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)
@@ -835,7 +834,6 @@ 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')