Fix EC2 response tags. Closes #37.

2013-07-17 12:48:21 -04:00 · 2013-07-17 12:48:21 -04:00 · 421a5e60af
commit 421a5e60af
parent af31744dbd
3 changed files with 41 additions and 9 deletions
--- a/moto/ec2/responses/instances.py
+++ b/moto/ec2/responses/instances.py
@ -184,7 +184,16 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns='http://ec2.amazona
                    <blockDeviceMapping />
                    <virtualizationType>hvm</virtualizationType>
                    <clientToken>ABCDE1234567890123</clientToken>
-                    <tagSet />
+                    <tagSet>
+                      {% for tag in instance.get_tags() %}
+                        <item>
+                          <resourceId>{{ tag.resource_id }}</resourceId>
+                          <resourceType>{{ tag.resource_type }}</resourceType>
+                          <key>{{ tag.key }}</key>
+                          <value>{{ tag.value }}</value>
+                        </item>
+                      {% endfor %}
+                    </tagSet>
                    <hypervisor>xen</hypervisor>
                    <networkInterfaceSet />
                  </item>