Merge pull request #2887 from DenverJ/enhancement/fix-describe-autoscaling-instances-filter
Add instance-id filter to describe_auto_scaling_instances
This commit is contained in:
commit
755a08e137
3 changed files with 40 additions and 4 deletions
|
|
@ -655,10 +655,16 @@ class AutoScalingBackend(BaseBackend):
|
|||
self.set_desired_capacity(group_name, 0)
|
||||
self.autoscaling_groups.pop(group_name, None)
|
||||
|
||||
def describe_auto_scaling_instances(self):
|
||||
def describe_auto_scaling_instances(self, instance_ids):
|
||||
instance_states = []
|
||||
for group in self.autoscaling_groups.values():
|
||||
instance_states.extend(group.instance_states)
|
||||
instance_states.extend(
|
||||
[
|
||||
x
|
||||
for x in group.instance_states
|
||||
if not instance_ids or x.instance.id in instance_ids
|
||||
]
|
||||
)
|
||||
return instance_states
|
||||
|
||||
def attach_instances(self, group_name, instance_ids):
|
||||
|
|
|
|||
|
|
@ -226,7 +226,9 @@ class AutoScalingResponse(BaseResponse):
|
|||
return template.render()
|
||||
|
||||
def describe_auto_scaling_instances(self):
|
||||
instance_states = self.autoscaling_backend.describe_auto_scaling_instances()
|
||||
instance_states = self.autoscaling_backend.describe_auto_scaling_instances(
|
||||
instance_ids=self._get_multi_param("InstanceIds.member")
|
||||
)
|
||||
template = self.response_template(DESCRIBE_AUTOSCALING_INSTANCES_TEMPLATE)
|
||||
return template.render(instance_states=instance_states)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue