From 33f64a465777b6778fa1bfe3d8c1218cc087a790 Mon Sep 17 00:00:00 2001 From: Wiktor Kolodziej Date: Sun, 26 Jun 2011 16:49:23 +0200 Subject: [PATCH 1/2] Added extra tags to the node dictionary (fixes LIBCLOUD-89) --- libcloud/compute/drivers/ec2.py | 4 +++- test/compute/test_ec2.py | 3 +++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index d624317..0c535a1 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -834,8 +834,10 @@ class EC2NodeDriver(NodeDriver): nodes = self._to_nodes(object, 'instancesSet/item') for node in nodes: - self.ex_create_tags(node=node, tags={'Name': kwargs['name']}) + tags = {'Name': kwargs['name']} + self.ex_create_tags(node=node, tags=tags) node.name = kwargs['name'] + node.extra.update({'tags': tags}) if len(nodes) == 1: return nodes[0] diff --git a/test/compute/test_ec2.py b/test/compute/test_ec2.py index 557cb5a..703481d 100644 --- a/test/compute/test_ec2.py +++ b/test/compute/test_ec2.py @@ -43,6 +43,9 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin): size = NodeSize('m1.small', 'Small Instance', None, None, None, None, driver=self.driver) node = self.driver.create_node(name='foo', image=image, size=size) self.assertEqual(node.id, 'i-2ba64342') + self.assertEqual(node.name, 'foo') + self.assertEqual(node.extra['tags']['Name'], 'foo') + self.assertEqual(len(node.extra['tags']), 1) def test_create_node_idempotent(self): EC2MockHttp.type = 'idempotent' -- 1.6.2.2.1669.g7eaf8