Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #533 from kevgliss/boto3DescribeInstancesSecurityGroups

Browse Source 
Ensuring boto3 can correctly identify instance security groups
This commit is contained in:
Steve Pulec 2016-02-14 16:47:01 -05:00
commit 800f2403cf
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
moto/ec2/responses/instances.py
View File

@ -314,8 +314,12 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
<groupSet> <groupSet>
{% for group in reservation.dynamic_group_list %} {% for group in reservation.dynamic_group_list %}
<item> <item>
{% if group.id %}
<groupId>{{ group.id }}</groupId> <groupId>{{ group.id }}</groupId>
<groupName>{{ group.name }}</groupName> <groupName>{{ group.name }}</groupName>
{% else %}
<groupId>{{ group }}</groupId>
{% endif %}
</item> </item>
{% endfor %} {% endfor %}
</groupSet> </groupSet>
@ -361,8 +365,12 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
<groupSet> <groupSet>
{% for group in instance.dynamic_group_list %} {% for group in instance.dynamic_group_list %}
<item> <item>
<groupId>{{ group.id }}</groupId> {% if group.id %}
<groupName>{{ group.name }}</groupName> <groupId>{{ group.id }}</groupId>
<groupName>{{ group.name }}</groupName>
{% else %}
<groupId>{{ group }}</groupId>
{% endif %}
</item> </item>
{% endfor %} {% endfor %}
</groupSet> </groupSet>
@ -418,8 +426,12 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
<groupSet> <groupSet>
{% for group in nic.group_set %} {% for group in nic.group_set %}
<item> <item>
<groupId>{{ group.id }}</groupId> {% if group.id %}
<groupName>{{ group.name }}</groupName> <groupId>{{ group.id }}</groupId>
<groupName>{{ group.name }}</groupName>
{% else %}
<groupId>{{ group }}</groupId>
{% endif %}
</item> </item>
{% endfor %} {% endfor %}
</groupSet> </groupSet>