From 1814db3dfbedd7c66adcbabccb06e902acc64f2d Mon Sep 17 00:00:00 2001 From: Steve Pulec Date: Mon, 3 Aug 2015 21:48:17 -0400 Subject: [PATCH] Fix launch configuration instance types. --- moto/autoscaling/responses.py | 2 +- tests/test_autoscaling/test_launch_configurations.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/moto/autoscaling/responses.py b/moto/autoscaling/responses.py index 7d863c2db..4f5948b6d 100644 --- a/moto/autoscaling/responses.py +++ b/moto/autoscaling/responses.py @@ -164,7 +164,7 @@ DESCRIBE_LAUNCH_CONFIGURATIONS_TEMPLATE = """ {% endif %} - m1.small + {{ launch_configuration.instance_type }} arn:aws:autoscaling:us-east-1:803981987763:launchConfiguration: 9dbbbf87-6141-428a-a409-0752edbe6cad:launchConfigurationName/my-test-lc {% if launch_configuration.block_device_mappings %} diff --git a/tests/test_autoscaling/test_launch_configurations.py b/tests/test_autoscaling/test_launch_configurations.py index d24480281..8020e46f6 100644 --- a/tests/test_autoscaling/test_launch_configurations.py +++ b/tests/test_autoscaling/test_launch_configurations.py @@ -15,7 +15,7 @@ def test_create_launch_configuration(): config = LaunchConfiguration( name='tester', image_id='ami-abcd1234', - instance_type='m1.small', + instance_type='t1.micro', key_name='the_keys', security_groups=["default", "default2"], user_data=b"This is some user_data", @@ -28,7 +28,7 @@ def test_create_launch_configuration(): launch_config = conn.get_all_launch_configurations()[0] launch_config.name.should.equal('tester') launch_config.image_id.should.equal('ami-abcd1234') - launch_config.instance_type.should.equal('m1.small') + launch_config.instance_type.should.equal('t1.micro') launch_config.key_name.should.equal('the_keys') set(launch_config.security_groups).should.equal(set(['default', 'default2'])) launch_config.user_data.should.equal(b"This is some user_data") @@ -136,14 +136,14 @@ def test_create_launch_configuration_using_ip_association_should_default_to_fals conn = boto.connect_autoscale() config = LaunchConfiguration( name='tester', - image_id='ami-abcd1234', ) + image_id='ami-abcd1234', + ) conn.create_launch_configuration(config) launch_config = conn.get_all_launch_configurations()[0] launch_config.associate_public_ip_address.should.equal(False) - @mock_autoscaling def test_create_launch_configuration_defaults(): """ Test with the minimum inputs and check that all of the proper defaults