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

Fix ASG instance_type.

Browse Source
This commit is contained in:
Steve Pulec 2015-08-03 21:52:43 -04:00
parent 1814db3dfb
commit df6ff57d24
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
moto/autoscaling/models.py
View File

@ -198,6 +198,7 @@ class FakeAutoScalingGroup(object):
count_needed, count_needed,
self.launch_config.user_data, self.launch_config.user_data,
self.launch_config.security_groups, self.launch_config.security_groups,
instance_type=self.launch_config.instance_type,
) )
for instance in reservation.instances: for instance in reservation.instances:
instance.autoscaling_group = self instance.autoscaling_group = self

19
tests/test_autoscaling/test_autoscaling.py
View File

@ -14,7 +14,7 @@ def test_create_autoscaling_group():
config = LaunchConfiguration( config = LaunchConfiguration(
name='tester', name='tester',
image_id='ami-abcd1234', image_id='ami-abcd1234',
instance_type='m1.small', instance_type='t2.medium',
) )
conn.create_launch_configuration(config) conn.create_launch_configuration(config)
@ -60,7 +60,7 @@ def test_create_autoscaling_groups_defaults():
config = LaunchConfiguration( config = LaunchConfiguration(
name='tester', name='tester',
image_id='ami-abcd1234', image_id='ami-abcd1234',
instance_type='m1.small', instance_type='t2.medium',
) )
conn.create_launch_configuration(config) conn.create_launch_configuration(config)
@ -96,7 +96,7 @@ def test_autoscaling_group_describe_filter():
config = LaunchConfiguration( config = LaunchConfiguration(
name='tester', name='tester',
image_id='ami-abcd1234', image_id='ami-abcd1234',
instance_type='m1.small', instance_type='t2.medium',
) )
conn.create_launch_configuration(config) conn.create_launch_configuration(config)
@ -122,7 +122,7 @@ def test_autoscaling_update():
config = LaunchConfiguration( config = LaunchConfiguration(
name='tester', name='tester',
image_id='ami-abcd1234', image_id='ami-abcd1234',
instance_type='m1.small', instance_type='t2.medium',
) )
conn.create_launch_configuration(config) conn.create_launch_configuration(config)
@ -153,7 +153,7 @@ def test_autoscaling_group_delete():
config = LaunchConfiguration( config = LaunchConfiguration(
name='tester', name='tester',
image_id='ami-abcd1234', image_id='ami-abcd1234',
instance_type='m1.small', instance_type='t2.medium',
) )
conn.create_launch_configuration(config) conn.create_launch_configuration(config)
@ -178,7 +178,7 @@ def test_autoscaling_group_describe_instances():
config = LaunchConfiguration( config = LaunchConfiguration(
name='tester', name='tester',
image_id='ami-abcd1234', image_id='ami-abcd1234',
instance_type='m1.small', instance_type='t2.medium',
) )
conn.create_launch_configuration(config) conn.create_launch_configuration(config)
@ -201,6 +201,7 @@ def test_autoscaling_group_describe_instances():
instances.should.have.length_of(2) instances.should.have.length_of(2)
instance_ids = [instance.id for instance in instances] instance_ids = [instance.id for instance in instances]
set(autoscale_instance_ids).should.equal(set(instance_ids)) set(autoscale_instance_ids).should.equal(set(instance_ids))
instances[0].instance_type.should.equal("t2.medium")
@requires_boto_gte("2.8") @requires_boto_gte("2.8")
@ -210,7 +211,7 @@ def test_set_desired_capacity_up():
config = LaunchConfiguration( config = LaunchConfiguration(
name='tester', name='tester',
image_id='ami-abcd1234', image_id='ami-abcd1234',
instance_type='m1.small', instance_type='t2.medium',
) )
conn.create_launch_configuration(config) conn.create_launch_configuration(config)
@ -245,7 +246,7 @@ def test_set_desired_capacity_down():
config = LaunchConfiguration( config = LaunchConfiguration(
name='tester', name='tester',
image_id='ami-abcd1234', image_id='ami-abcd1234',
instance_type='m1.small', instance_type='t2.medium',
) )
conn.create_launch_configuration(config) conn.create_launch_configuration(config)
@ -280,7 +281,7 @@ def test_set_desired_capacity_the_same():
config = LaunchConfiguration( config = LaunchConfiguration(
name='tester', name='tester',
image_id='ami-abcd1234', image_id='ami-abcd1234',
instance_type='m1.small', instance_type='t2.medium',
) )
conn.create_launch_configuration(config) conn.create_launch_configuration(config)