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

ELBs can now be deleted before their autoscaling groups.

Browse source 
Also, fix name clash in autoscaling tests.
This commit is contained in:
Marco Rucci 2016-05-15 21:17:59 +02:00
commit a330b1d346
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
moto/autoscaling/models.py
View file

@ -197,17 +197,10 @@ class FakeAutoScalingGroup(object):
backend.delete_autoscaling_group(resource_name)
except KeyError:
pass
except LoadBalancerNotFoundError:
# sometimes the ELB gets modified before the ASG, so just skip over desired capacity
backend.autoscaling_groups.pop(resource_name, None)
def delete(self, region_name):
backend = autoscaling_backends[region_name]
try:
backend.delete_autoscaling_group(self.name)
except LoadBalancerNotFoundError:
# sometimes the ELB gets deleted before the ASG, so just skip over desired capacity
backend.autoscaling_groups.pop(self.name, None)
backend.delete_autoscaling_group(self.name)
@property
def physical_resource_id(self):
@ -435,7 +428,14 @@ class AutoScalingBackend(BaseBackend):
def update_attached_elbs(self, group_name):
group = self.autoscaling_groups[group_name]
group_instance_ids = set(state.instance.id for state in group.instance_states)
for elb in self.elb_backend.describe_load_balancers(names=group.load_balancers):
try:
elbs = self.elb_backend.describe_load_balancers(names=group.load_balancers)
except LoadBalancerNotFoundError:
# ELBs can be deleted before their autoscaling group
return
for elb in elbs:
elb_instace_ids = set(elb.instance_ids)
self.elb_backend.register_instances(elb.name, group_instance_ids - elb_instace_ids)
self.elb_backend.deregister_instances(elb.name, elb_instace_ids - group_instance_ids)