From c53e53495cd01f735247c823a905887f09e56bdc Mon Sep 17 00:00:00 2001 From: gigimon Date: Fri, 27 Dec 2013 17:04:25 +0200 Subject: [PATCH] LIBCLOUD-475 fix key_name in Ec2 and Cloudstack drivers --- 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(-) 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), 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", 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 @@ + my-key-pair 1.2.3.5 1.2.3.5 0 @@ -43,6 +44,7 @@ + my-key-pair2 1.2.3.5 1.2.3.5 0 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] 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') -- 1.8.3.4 (Apple Git-47)