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

Added instance_type support to instances

Browse source
This commit is contained in:
Chris St. Pierre 2014-05-07 08:36:19 -04:00
commit 5ba2b3cb9a
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
moto/ec2/responses/instances.py
View file

@ -33,7 +33,8 @@ class InstanceResponse(BaseResponse):
image_id = self.querystring.get('ImageId')[0]
user_data = self.querystring.get('UserData')
security_group_names = self._get_multi_param('SecurityGroup')
new_reservation = ec2_backend.add_instances(image_id, min_count, user_data, security_group_names)
instance_type = self.querystring.get("InstanceType", ["m1.small"])[0]
new_reservation = ec2_backend.add_instances(image_id, min_count, user_data, security_group_names, instance_type=instance_type)
template = Template(EC2_RUN_INSTANCES)
return template.render(reservation=new_reservation)
@ -111,7 +112,7 @@ EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc
<dnsName/>
<reason/>
<amiLaunchIndex>0</amiLaunchIndex>
<instanceType>m1.small</instanceType>
<instanceType>{{ instance.instance_type }}</instanceType>
<launchTime>2007-08-07T11:51:50.000Z</launchTime>
<placement>
<availabilityZone>us-east-1b</availabilityZone>
@ -162,7 +163,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns='http://ec2.amazona
<keyName>gsg-keypair</keyName>
<amiLaunchIndex>0</amiLaunchIndex>
<productCodes/>
<instanceType>c1.medium</instanceType>
<instanceType>{{ instance.instance_type }}</instanceType>
<launchTime>YYYY-MM-DDTHH:MM:SS+0000</launchTime>
<placement>
<availabilityZone>us-west-2a</availabilityZone>