catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix EC2 response tags. Closes #37.

Browse source
This commit is contained in:
Steve Pulec 2013-07-17 12:48:21 -04:00
commit 421a5e60af
3 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
moto/ec2/models.py
View file

@ -47,6 +47,10 @@ class Instance(BotoInstance):
self._state.name = "pending"
self._state.code = 0
def get_tags(self):
tags = ec2_backend.describe_tags(self.id)
return tags
class InstanceBackend(object):
@ -165,18 +169,21 @@ class TagBackend(object):
def delete_tag(self, resource_id, key):
return self.tags[resource_id].pop(key)
def describe_tags(self):
def describe_tags(self, filter_resource_ids=None):
results = []
for resource_id, tags in self.tags.iteritems():
ami = 'ami' in resource_id
for key, value in tags.iteritems():
result = {
'resource_id': resource_id,
'key': key,
'value': value,
'resource_type': 'image' if ami else 'instance',
}
results.append(result)
if not filter_resource_ids or resource_id in filter_resource_ids:
# If we're not filtering, or we are filtering and this
# resource id is in the filter list, add this tag
result = {
'resource_id': resource_id,
'key': key,
'value': value,
'resource_type': 'image' if ami else 'instance',
}
results.append(result)
return results