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

Fix launch configuration instance types.

Browse Source
This commit is contained in:
Steve Pulec 2015-08-03 21:48:17 -04:00
parent 92c96b6788
commit 1814db3dfb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/autoscaling/responses.py
View File

@ -164,7 +164,7 @@ DESCRIBE_LAUNCH_CONFIGURATIONS_TEMPLATE = """<DescribeLaunchConfigurationsRespon
{% else %} {% else %}
<UserData/> <UserData/>
{% endif %} {% endif %}
<InstanceType>m1.small</InstanceType> <InstanceType>{{ launch_configuration.instance_type }}</InstanceType>
<LaunchConfigurationARN>arn:aws:autoscaling:us-east-1:803981987763:launchConfiguration: <LaunchConfigurationARN>arn:aws:autoscaling:us-east-1:803981987763:launchConfiguration:
9dbbbf87-6141-428a-a409-0752edbe6cad:launchConfigurationName/my-test-lc</LaunchConfigurationARN> 9dbbbf87-6141-428a-a409-0752edbe6cad:launchConfigurationName/my-test-lc</LaunchConfigurationARN>
{% if launch_configuration.block_device_mappings %} {% if launch_configuration.block_device_mappings %}

8
tests/test_autoscaling/test_launch_configurations.py
View File

@ -15,7 +15,7 @@ def test_create_launch_configuration():
config = LaunchConfiguration( config = LaunchConfiguration(
name='tester', name='tester',
image_id='ami-abcd1234', image_id='ami-abcd1234',
instance_type='m1.small', instance_type='t1.micro',
key_name='the_keys', key_name='the_keys',
security_groups=["default", "default2"], security_groups=["default", "default2"],
user_data=b"This is some user_data", 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 = conn.get_all_launch_configurations()[0]
launch_config.name.should.equal('tester') launch_config.name.should.equal('tester')
launch_config.image_id.should.equal('ami-abcd1234') 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') launch_config.key_name.should.equal('the_keys')
set(launch_config.security_groups).should.equal(set(['default', 'default2'])) set(launch_config.security_groups).should.equal(set(['default', 'default2']))
launch_config.user_data.should.equal(b"This is some user_data") 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() conn = boto.connect_autoscale()
config = LaunchConfiguration( config = LaunchConfiguration(
name='tester', name='tester',
image_id='ami-abcd1234', ) image_id='ami-abcd1234',
)
conn.create_launch_configuration(config) conn.create_launch_configuration(config)
launch_config = conn.get_all_launch_configurations()[0] launch_config = conn.get_all_launch_configurations()[0]
launch_config.associate_public_ip_address.should.equal(False) launch_config.associate_public_ip_address.should.equal(False)
@mock_autoscaling @mock_autoscaling
def test_create_launch_configuration_defaults(): def test_create_launch_configuration_defaults():
""" Test with the minimum inputs and check that all of the proper defaults """ Test with the minimum inputs and check that all of the proper defaults