From 1ed5f50d56a645a3c04090b29e8264d1d77e7a7b Mon Sep 17 00:00:00 2001
From: Oleksandr Shulgin <oleksandr.shulgin@zalando.de>
Date: Mon, 14 Dec 2015 12:38:10 +0100
Subject: [PATCH 1/2] Fix ELB.describe_tags with multiple LoadBalancerNames.

---
 moto/elb/responses.py      |  9 +++++++--
 tests/test_elb/test_elb.py | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/moto/elb/responses.py b/moto/elb/responses.py
index 0ed230afd..934bfaef0 100644
--- a/moto/elb/responses.py
+++ b/moto/elb/responses.py
@@ -277,6 +277,7 @@ class ELBResponse(BaseResponse):
         return template.render()
 
     def describe_tags(self):
+        elbs = []
         for key, value in self.querystring.items():
             if "LoadBalancerNames.member" in key:
                 number = key.split('.')[2]
@@ -284,9 +285,10 @@ class ELBResponse(BaseResponse):
                 elb = self.elb_backend.get_load_balancer(load_balancer_name)
                 if not elb:
                     raise LoadBalancerNotFound(load_balancer_name)
+                elbs.append(elb)
 
         template = self.response_template(DESCRIBE_TAGS_TEMPLATE)
-        return template.render(tags=elb.tags)
+        return template.render(load_balancers=elbs)
 
 ADD_TAGS_TEMPLATE = """<AddTagsResponse xmlns="http://elasticloadbalancing.amazonaws.com/doc/2012-06-01/">
   <AddTagsResult/>
@@ -305,9 +307,11 @@ REMOVE_TAGS_TEMPLATE = """<RemoveTagsResponse xmlns="http://elasticloadbalancing
 DESCRIBE_TAGS_TEMPLATE = """<DescribeTagsResponse xmlns="http://elasticloadbalancing.amazonaws.com/doc/2012-06-01/">
   <DescribeTagsResult>
     <TagDescriptions>
+      {% for elb in load_balancers %}
       <member>
+        <LoadBalancerName>{{ elb.name }}</LoadBalancerName>
         <Tags>
-          {% for key, value in tags.items() %}
+          {% for key, value in elb.tags.items() %}
           <member>
             <Value>{{ value }}</Value>
             <Key>{{ key }}</Key>
@@ -315,6 +319,7 @@ DESCRIBE_TAGS_TEMPLATE = """<DescribeTagsResponse xmlns="http://elasticloadbalan
           {% endfor %}
         </Tags>
       </member>
+      {% endfor %}
     </TagDescriptions>
   </DescribeTagsResult>
   <ResponseMetadata>
diff --git a/tests/test_elb/test_elb.py b/tests/test_elb/test_elb.py
index e16d490aa..bd0a74df0 100644
--- a/tests/test_elb/test_elb.py
+++ b/tests/test_elb/test_elb.py
@@ -698,3 +698,23 @@ def test_add_remove_tags():
     tags.should.have.key('i').which.should.equal('b')
     tags.should.have.key('j').which.should.equal('c')
 
+
+    client.create_load_balancer(
+        LoadBalancerName='other-lb',
+        Listeners=[{'Protocol':'tcp', 'LoadBalancerPort':433, 'InstancePort':8433}],
+        AvailabilityZones=['us-east-1a', 'us-east-1b']
+    )
+
+    client.add_tags(LoadBalancerNames=['other-lb'],
+                    Tags=[{
+                       'Key': 'other',
+                       'Value': 'something'
+                    }])
+
+    lb_tags = { l['LoadBalancerName']: { d['Key']: d['Value'] for d in l['Tags'] } for l in client.describe_tags(LoadBalancerNames=['my-lb', 'other-lb'])['TagDescriptions'] }
+
+    lb_tags.should.have.key('my-lb')
+    lb_tags.should.have.key('other-lb')
+
+    lb_tags['my-lb'].shouldnt.have.key('other')
+    lb_tags['other-lb'].should.have.key('other').which.should.equal('something')

From ef4332d89298c46c361e9f39939048887b0bc2d6 Mon Sep 17 00:00:00 2001
From: Oleksandr Shulgin <oleksandr.shulgin@zalando.de>
Date: Mon, 14 Dec 2015 12:55:34 +0100
Subject: [PATCH 2/2] Fix dict syntax for python-2.6 in test_elb

---
 tests/test_elb/test_elb.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_elb/test_elb.py b/tests/test_elb/test_elb.py
index bd0a74df0..2a0c6f86f 100644
--- a/tests/test_elb/test_elb.py
+++ b/tests/test_elb/test_elb.py
@@ -711,7 +711,8 @@ def test_add_remove_tags():
                        'Value': 'something'
                     }])
 
-    lb_tags = { l['LoadBalancerName']: { d['Key']: d['Value'] for d in l['Tags'] } for l in client.describe_tags(LoadBalancerNames=['my-lb', 'other-lb'])['TagDescriptions'] }
+    lb_tags = dict([(l['LoadBalancerName'], dict([(d['Key'], d['Value']) for d in l['Tags']]))
+                    for l in client.describe_tags(LoadBalancerNames=['my-lb', 'other-lb'])['TagDescriptions']])
 
     lb_tags.should.have.key('my-lb')
     lb_tags.should.have.key('other-lb')