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

switch to using boto's SpotInstanceRequest in backend

Browse source
This commit is contained in:
Konstantinos Koukopoulos 2014-06-17 19:04:38 +03:00
commit 60bba47624
2 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

50
moto/ec2/responses/spot_instances.py
View file

@ -95,27 +95,27 @@ REQUEST_SPOT_INSTANCES_TEMPLATE = """<RequestSpotInstancesResponse xmlns="http:/
</status>
<availabilityZoneGroup>{{ request.availability_zone_group }}</availabilityZoneGroup>
<launchSpecification>
<imageId>{{ request.image_id }}</imageId>
<keyName>{{ request.key_name }}</keyName>
<imageId>{{ request.launch_specification.image_id }}</imageId>
<keyName>{{ request.launch_specification.key_name }}</keyName>
<groupSet>
{% for group in request.security_groups %}
{% for group in request.launch_specification.groups %}
<item>
<groupId>{{ group.id }}</groupId>
<groupName>{{ group.name }}</groupName>
</item>
{% endfor %}
</groupSet>
<kernelId>{{ request.kernel_id }}</kernelId>
<ramdiskId>{{ request.ramdisk_id }}</ramdiskId>
<subnetId>{{ request.subnet_id }}</subnetId>
<instanceType>{{ request.instance_type }}</instanceType>
<kernelId>{{ request.launch_specification.kernel }}</kernelId>
<ramdiskId>{{ request.launch_specification.ramdisk }}</ramdiskId>
<subnetId>{{ request.launch_specification.subnet_id }}</subnetId>
<instanceType>{{ request.launch_specification.instance_type }}</instanceType>
<blockDeviceMapping/>
<monitoring>
<enabled>{{ request.monitoring_enabled }}</enabled>
<enabled>{{ request.launch_specification.monitored }}</enabled>
</monitoring>
<ebsOptimized>{{ request.ebs_optimized }}</ebsOptimized>
<ebsOptimized>{{ request.launch_specification.ebs_optimized }}</ebsOptimized>
<PlacementRequestType>
<availabilityZone>{{ request.placement }}</availabilityZone>
<availabilityZone>{{ request.launch_specification.placement }}</availabilityZone>
<groupName></groupName>
</PlacementRequestType>
</launchSpecification>
@ -151,36 +151,36 @@ DESCRIBE_SPOT_INSTANCES_TEMPLATE = """<DescribeSpotInstanceRequestsResponse xmln
<availabilityZoneGroup>{{ request.availability_zone_group }}</availabilityZoneGroup>
{% endif %}
<launchSpecification>
<imageId>{{ request.image_id }}</imageId>
{% if request.key_name %}
<keyName>{{ request.key_name }}</keyName>
<imageId>{{ request.launch_specification.image_id }}</imageId>
{% if request.launch_specification.key_name %}
<keyName>{{ request.launch_specification.key_name }}</keyName>
{% endif %}
<groupSet>
{% for group in request.security_groups %}
{% for group in request.launch_specification.groups %}
<item>
<groupId>{{ group.id }}</groupId>
<groupName>{{ group.name }}</groupName>
</item>
{% endfor %}
</groupSet>
{% if request.kernel_id %}
<kernelId>{{ request.kernel_id }}</kernelId>
{% if request.launch_specification.kernel %}
<kernelId>{{ request.launch_specification.kernel }}</kernelId>
{% endif %}
{% if request.ramdisk_id %}
<ramdiskId>{{ request.ramdisk_id }}</ramdiskId>
{% if request.launch_specification.ramdisk %}
<ramdiskId>{{ request.launch_specification.ramdisk }}</ramdiskId>
{% endif %}
{% if request.subnet_id %}
<subnetId>{{ request.subnet_id }}</subnetId>
{% if request.launch_specification.subnet_id %}
<subnetId>{{ request.launch_specification.subnet_id }}</subnetId>
{% endif %}
<instanceType>{{ request.instance_type }}</instanceType>
<instanceType>{{ request.launch_specification.instance_type }}</instanceType>
<blockDeviceMapping/>
<monitoring>
<enabled>{{ request.monitoring_enabled }}</enabled>
<enabled>{{ request.launch_specification.monitored }}</enabled>
</monitoring>
<ebsOptimized>{{ request.ebs_optimized }}</ebsOptimized>
{% if request.placement %}
<ebsOptimized>{{ request.launch_specification.ebs_optimized }}</ebsOptimized>
{% if request.launch_specification.placement %}
<PlacementRequestType>
<availabilityZone>{{ request.placement }}</availabilityZone>
<availabilityZone>{{ request.launch_specification.placement }}</availabilityZone>
<groupName></groupName>
</PlacementRequestType>
{% endif %}