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

EC2: Add support for the IncludeAllInstances option in DescribeInstanceStatus

Browse Source
This commit is contained in:
Arthur Wang 2014-10-24 19:44:29 +00:00
parent 203ce6b185
commit 31b55977c9
2 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moto/ec2/models.py
View File

@ -542,6 +542,14 @@ class InstanceBackend(object):
instances.append(instance) instances.append(instance)
return instances return instances
def all_running_instances(self):
instances = []
for reservation in self.all_reservations():
for instance in reservation.instances:
if instance.state_code == 16:
instances.append(instance)
return instances
def get_multi_instances_by_id(self, instance_ids): def get_multi_instances_by_id(self, instance_ids):
""" """
:param instance_ids: A string list with instance ids :param instance_ids: A string list with instance ids

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

@ -4,7 +4,7 @@ from jinja2 import Template
from moto.core.responses import BaseResponse from moto.core.responses import BaseResponse
from moto.core.utils import camelcase_to_underscores from moto.core.utils import camelcase_to_underscores
from moto.ec2.utils import instance_ids_from_querystring, filters_from_querystring, filter_reservations, \ from moto.ec2.utils import instance_ids_from_querystring, filters_from_querystring, filter_reservations, \
dict_from_querystring dict_from_querystring, optional_from_querystring
class InstanceResponse(BaseResponse): class InstanceResponse(BaseResponse):
@ -69,11 +69,15 @@ class InstanceResponse(BaseResponse):
def describe_instance_status(self): def describe_instance_status(self):
instance_ids = instance_ids_from_querystring(self.querystring) instance_ids = instance_ids_from_querystring(self.querystring)
include_all_instances = optional_from_querystring('IncludeAllInstances',
self.querystring) == 'true'
if instance_ids: if instance_ids:
instances = self.ec2_backend.get_multi_instances_by_id(instance_ids) instances = self.ec2_backend.get_multi_instances_by_id(instance_ids)
else: elif include_all_instances:
instances = self.ec2_backend.all_instances() instances = self.ec2_backend.all_instances()
else:
instances = self.ec2_backend.all_running_instances()
template = Template(EC2_INSTANCE_STATUS) template = Template(EC2_INSTANCE_STATUS)
return template.render(instances=instances) return template.render(instances=instances)
@ -512,9 +516,10 @@ EC2_INSTANCE_STATUS = """<?xml version="1.0" encoding="UTF-8"?>
<instanceId>{{ instance.id }}</instanceId> <instanceId>{{ instance.id }}</instanceId>
<availabilityZone>us-east-1d</availabilityZone> <availabilityZone>us-east-1d</availabilityZone>
<instanceState> <instanceState>
<code>16</code> <code>{{ instance.state_code }}</code>
<name>running</name> <name>{{ instance.state }}</name>
</instanceState> </instanceState>
{% if instance.state_code == 16 %}
<systemStatus> <systemStatus>
<status>ok</status> <status>ok</status>
<details> <details>
@ -533,6 +538,14 @@ EC2_INSTANCE_STATUS = """<?xml version="1.0" encoding="UTF-8"?>
</item> </item>
</details> </details>
</instanceStatus> </instanceStatus>
{% else %}
<systemStatus>
<status>not-applicable</status>
</systemStatus>
<instanceStatus>
<status>not-applicable</status>
</instanceStatus>
{% endif %}
</item> </item>
{% endfor %} {% endfor %}
</instanceStatusSet> </instanceStatusSet>