LIBCLOUD-475 fix key_name in Ec2 and Cloudstack drivers 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/1ab9da5c Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1ab9da5c Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1ab9da5c Branch: refs/heads/trunk Commit: 1ab9da5c87caddd8b5e0b5ff13cb39d3ded2693f Parents: 4e8a91e Author: gigimon <[email protected]> Authored: Fri Dec 27 17:04:25 2013 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Fri Dec 27 16:11:58 2013 +0100 ---------------------------------------------------------------------- libcloud/compute/drivers/cloudstack.py | 2 +- libcloud/compute/drivers/ec2.py | 2 +- libcloud/test/compute/fixtures/ec2/describe_instances.xml | 2 ++ libcloud/test/compute/test_cloudstack.py | 4 ++-- libcloud/test/compute/test_ec2.py | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/1ab9da5c/libcloud/compute/drivers/cloudstack.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/cloudstack.py b/libcloud/compute/drivers/cloudstack.py index c2fed2f..1cc82b2 100644 --- a/libcloud/compute/drivers/cloudstack.py +++ b/libcloud/compute/drivers/cloudstack.py @@ -1536,7 +1536,7 @@ class CloudStackNodeDriver(CloudStackDriverMixIn, NodeDriver): 'ip_forwarding_rules': [], 'port_forwarding_rules': [], 'password': password, - 'keyname': keypair, + 'key_name': keypair, 'security_group': security_groups, 'created': created, 'image_id': data.get('templateid', None), http://git-wip-us.apache.org/repos/asf/libcloud/blob/1ab9da5c/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 48fbdbc..b61ecfa 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -792,7 +792,7 @@ class BaseEC2NodeDriver(NodeDriver): namespace=NAMESPACE), 'status': findattr(element=element, xpath="instanceState/name", namespace=NAMESPACE), - 'keyname': findattr(element=element, xpath="keyName", + 'key_name': findattr(element=element, xpath="keyName", namespace=NAMESPACE), 'launchindex': findattr(element=element, xpath="amiLaunchIndex", http://git-wip-us.apache.org/repos/asf/libcloud/blob/1ab9da5c/libcloud/test/compute/fixtures/ec2/describe_instances.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/fixtures/ec2/describe_instances.xml b/libcloud/test/compute/fixtures/ec2/describe_instances.xml index 3ba4071..c7f6594 100644 --- a/libcloud/test/compute/fixtures/ec2/describe_instances.xml +++ b/libcloud/test/compute/fixtures/ec2/describe_instances.xml @@ -20,6 +20,7 @@ <privateDnsName/> <dnsName/> <reason/> + <keyName>my-key-pair</keyName> <privateIpAddress>1.2.3.5</privateIpAddress> <ipAddress>1.2.3.5</ipAddress> <amiLaunchIndex>0</amiLaunchIndex> @@ -43,6 +44,7 @@ <privateDnsName/> <dnsName/> <reason/> + <keyName>my-key-pair2</keyName> <privateIpAddress>1.2.3.5</privateIpAddress> <ipAddress>1.2.3.5</ipAddress> <amiLaunchIndex>0</amiLaunchIndex> http://git-wip-us.apache.org/repos/asf/libcloud/blob/1ab9da5c/libcloud/test/compute/test_cloudstack.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_cloudstack.py b/libcloud/test/compute/test_cloudstack.py index 005ee58..146241e 100644 --- a/libcloud/test/compute/test_cloudstack.py +++ b/libcloud/test/compute/test_cloudstack.py @@ -133,7 +133,7 @@ class CloudStackCommonTestCase(TestCaseMixin): size=size, ex_keyname='foobar') self.assertEqual(node.name, 'test') - self.assertEqual(node.extra['keyname'], 'foobar') + self.assertEqual(node.extra['key_name'], 'foobar') def test_list_images_no_images_available(self): CloudStackMockHttp.fixture_tag = 'notemplates' @@ -248,7 +248,7 @@ class CloudStackCommonTestCase(TestCaseMixin): self.assertEqual('test', nodes[0].name) self.assertEqual('2600', nodes[0].id) self.assertEqual([], nodes[0].extra['security_group']) - self.assertEqual(None, nodes[0].extra['keyname']) + self.assertEqual(None, nodes[0].extra['key_name']) def test_list_locations(self): location = self.driver.list_locations()[0] http://git-wip-us.apache.org/repos/asf/libcloud/blob/1ab9da5c/libcloud/test/compute/test_ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py index 6d71202..aeb1ddb 100644 --- a/libcloud/test/compute/test_ec2.py +++ b/libcloud/test/compute/test_ec2.py @@ -176,6 +176,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): self.assertEqual(len(node.public_ips), 2) self.assertEqual(node.extra['launchdatetime'], '2009-08-07T05:47:04.000Z') + self.assertEqual(node.extra['key_name'], 'my-key-pair') self.assertTrue('instancetype' in node.extra) self.assertEqual(public_ips[0], '1.2.3.4')
