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

Add health status to autoscaling instances

Browse Source
This commit is contained in:
Paul Carleton 2017-10-20 10:50:00 -07:00
parent efefc1714e
commit 21c3775cb1
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/autoscaling/models.py
View File

@ -16,9 +16,10 @@ ASG_NAME_TAG = "aws:autoscaling:groupName"
class InstanceState(object): class InstanceState(object):
def __init__(self, instance, lifecycle_state="InService"): def __init__(self, instance, lifecycle_state="InService", health_status="Healthy"):
self.instance = instance self.instance = instance
self.lifecycle_state = lifecycle_state self.lifecycle_state = lifecycle_state
self.health_status = health_status
class FakeScalingPolicy(BaseModel): class FakeScalingPolicy(BaseModel):

4
moto/autoscaling/responses.py
View File

@ -397,7 +397,7 @@ DESCRIBE_AUTOSCALING_GROUPS_TEMPLATE = """<DescribeAutoScalingGroupsResponse xml
<Instances> <Instances>
{% for instance_state in group.instance_states %} {% for instance_state in group.instance_states %}
<member> <member>
<HealthStatus>HEALTHY</HealthStatus> <HealthStatus>{{ instance_state.health_status }}</HealthStatus>
<AvailabilityZone>us-east-1e</AvailabilityZone> <AvailabilityZone>us-east-1e</AvailabilityZone>
<InstanceId>{{ instance_state.instance.id }}</InstanceId> <InstanceId>{{ instance_state.instance.id }}</InstanceId>
<LaunchConfigurationName>{{ group.launch_config_name }}</LaunchConfigurationName> <LaunchConfigurationName>{{ group.launch_config_name }}</LaunchConfigurationName>
@ -472,7 +472,7 @@ DESCRIBE_AUTOSCALING_INSTANCES_TEMPLATE = """<DescribeAutoScalingInstancesRespon
<AutoScalingInstances> <AutoScalingInstances>
{% for instance_state in instance_states %} {% for instance_state in instance_states %}
<member> <member>
<HealthStatus>HEALTHY</HealthStatus> <HealthStatus>{{ instance_state.health_status }}</HealthStatus>
<AutoScalingGroupName>{{ instance_state.instance.autoscaling_group.name }}</AutoScalingGroupName> <AutoScalingGroupName>{{ instance_state.instance.autoscaling_group.name }}</AutoScalingGroupName>
<AvailabilityZone>us-east-1e</AvailabilityZone> <AvailabilityZone>us-east-1e</AvailabilityZone>
<InstanceId>{{ instance_state.instance.id }}</InstanceId> <InstanceId>{{ instance_state.instance.id }}</InstanceId>

23
tests/test_autoscaling/test_autoscaling.py
View File

@ -311,6 +311,7 @@ def test_autoscaling_group_describe_instances():
instances = list(conn.get_all_autoscaling_instances()) instances = list(conn.get_all_autoscaling_instances())
instances.should.have.length_of(2) instances.should.have.length_of(2)
instances[0].launch_config_name.should.equal('tester') instances[0].launch_config_name.should.equal('tester')
instances[0].health_status.should.equal('Healthy')
autoscale_instance_ids = [instance.instance_id for instance in instances] autoscale_instance_ids = [instance.instance_id for instance in instances]
ec2_conn = boto.connect_ec2() ec2_conn = boto.connect_ec2()
@ -959,3 +960,25 @@ def test_attach_one_instance():
AutoScalingGroupNames=['test_asg'] AutoScalingGroupNames=['test_asg']
) )
response['AutoScalingGroups'][0]['Instances'].should.have.length_of(3) response['AutoScalingGroups'][0]['Instances'].should.have.length_of(3)
@mock_autoscaling
@mock_ec2
def test_describe_instance_health():
client = boto3.client('autoscaling', region_name='us-east-1')
_ = client.create_launch_configuration(
LaunchConfigurationName='test_launch_configuration'
)
client.create_auto_scaling_group(
AutoScalingGroupName='test_asg',
LaunchConfigurationName='test_launch_configuration',
MinSize=2,
MaxSize=4,
DesiredCapacity=2,
)
response = client.describe_auto_scaling_groups(
AutoScalingGroupNames=['test_asg']
)
instance1 = response['AutoScalingGroups'][0]['Instances'][0]
instance1['HealthStatus'].should.equal('Healthy')