From 19c9c593677dcec7c7f298483c584a2052873408 Mon Sep 17 00:00:00 2001 From: acsbendi Date: Fri, 19 Jul 2019 12:56:27 +0200 Subject: [PATCH] Implemented Auto Scaling groups recreate terminated instances. --- moto/autoscaling/models.py | 12 ++++++++++++ moto/ec2/responses/instances.py | 3 +++ 2 files changed, 15 insertions(+) diff --git a/moto/autoscaling/models.py b/moto/autoscaling/models.py index 24811be73..83de9712a 100644 --- a/moto/autoscaling/models.py +++ b/moto/autoscaling/models.py @@ -684,6 +684,18 @@ class AutoScalingBackend(BaseBackend): for instance in protected_instances: instance.protected_from_scale_in = protected_from_scale_in + def notify_terminate_instances(self, instance_ids): + for autoscaling_group_name, autoscaling_group in self.autoscaling_groups.items(): + original_instance_count = len(autoscaling_group.instance_states) + autoscaling_group.instance_states = list(filter( + lambda i_state: i_state.instance.id not in instance_ids, + autoscaling_group.instance_states + )) + difference = original_instance_count - len(autoscaling_group.instance_states) + if difference > 0: + autoscaling_group.replace_autoscaling_group_instances(difference, autoscaling_group.get_propagated_tags()) + self.update_attached_elbs(autoscaling_group_name) + autoscaling_backends = {} for region, ec2_backend in ec2_backends.items(): diff --git a/moto/ec2/responses/instances.py b/moto/ec2/responses/instances.py index a5359daca..20b355a6a 100644 --- a/moto/ec2/responses/instances.py +++ b/moto/ec2/responses/instances.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals from boto.ec2.instancetype import InstanceType + +from moto.autoscaling import autoscaling_backends from moto.core.responses import BaseResponse from moto.core.utils import camelcase_to_underscores from moto.ec2.utils import filters_from_querystring, \ @@ -64,6 +66,7 @@ class InstanceResponse(BaseResponse): instance_ids = self._get_multi_param('InstanceId') if self.is_not_dryrun('TerminateInstance'): instances = self.ec2_backend.terminate_instances(instance_ids) + autoscaling_backends[self.region].notify_terminate_instances(instance_ids) template = self.response_template(EC2_TERMINATE_INSTANCES) return template.render(instances=instances)