From 52eb16d765608a20aa84ddfdaa8755930dc70c7e Mon Sep 17 00:00:00 2001 From: gigimon Date: Tue, 2 Feb 2016 16:15:18 +0300 Subject: [PATCH] * change api version to 2013-10-15 --- moto/ec2/responses/amis.py | 14 ++++++------- .../availability_zones_and_regions.py | 4 ++-- moto/ec2/responses/customer_gateways.py | 4 ++-- moto/ec2/responses/elastic_block_store.py | 20 +++++++++---------- moto/ec2/responses/elastic_ip_addresses.py | 10 +++++----- .../responses/elastic_network_interfaces.py | 12 +++++------ moto/ec2/responses/general.py | 2 +- moto/ec2/responses/instances.py | 18 ++++++++--------- moto/ec2/responses/key_pairs.py | 2 +- moto/ec2/responses/network_acls.py | 10 +++++----- moto/ec2/responses/route_tables.py | 18 ++++++++--------- moto/ec2/responses/security_groups.py | 14 ++++++------- moto/ec2/responses/spot_instances.py | 6 +++--- moto/ec2/responses/subnets.py | 6 +++--- moto/ec2/responses/tags.py | 6 +++--- .../ec2/responses/virtual_private_gateways.py | 10 +++++----- moto/ec2/responses/vpc_peering_connections.py | 10 +++++----- moto/ec2/responses/vpcs.py | 6 +++--- 18 files changed, 86 insertions(+), 86 deletions(-) diff --git a/moto/ec2/responses/amis.py b/moto/ec2/responses/amis.py index 7d715fd51..aecf55292 100644 --- a/moto/ec2/responses/amis.py +++ b/moto/ec2/responses/amis.py @@ -64,18 +64,18 @@ class AmisResponse(BaseResponse): raise NotImplementedError('AMIs.reset_image_attribute is not yet implemented') -CREATE_IMAGE_RESPONSE = """ +CREATE_IMAGE_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ image.id }} """ -COPY_IMAGE_RESPONSE = """ +COPY_IMAGE_RESPONSE = """ 60bc441d-fa2c-494d-b155-5d6a3EXAMPLE {{ image.id }} """ # TODO almost all of these params should actually be templated based on the ec2 image -DESCRIBE_IMAGES_RESPONSE = """ +DESCRIBE_IMAGES_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {% for image in images %} @@ -125,7 +125,7 @@ DESCRIBE_IMAGES_RESPONSE = """ +DESCRIBE_IMAGE_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ image.id }} <{{ key }}> @@ -133,13 +133,13 @@ DESCRIBE_IMAGE_RESPONSE = """ +DEREGISTER_IMAGE_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ success }} """ DESCRIBE_IMAGE_ATTRIBUTES_RESPONSE = """ - + 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ ami_id }} {% if not groups and not users %} @@ -165,7 +165,7 @@ DESCRIBE_IMAGE_ATTRIBUTES_RESPONSE = """ """ MODIFY_IMAGE_ATTRIBUTE_RESPONSE = """ - + true """ diff --git a/moto/ec2/responses/availability_zones_and_regions.py b/moto/ec2/responses/availability_zones_and_regions.py index ee65ce968..50869e934 100644 --- a/moto/ec2/responses/availability_zones_and_regions.py +++ b/moto/ec2/responses/availability_zones_and_regions.py @@ -13,7 +13,7 @@ class AvailabilityZonesAndRegions(BaseResponse): template = self.response_template(DESCRIBE_REGIONS_RESPONSE) return template.render(regions=regions) -DESCRIBE_REGIONS_RESPONSE = """ +DESCRIBE_REGIONS_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {% for region in regions %} @@ -25,7 +25,7 @@ DESCRIBE_REGIONS_RESPONSE = """ +DESCRIBE_ZONES_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {% for zone in zones %} diff --git a/moto/ec2/responses/customer_gateways.py b/moto/ec2/responses/customer_gateways.py index a6d460c88..85f50fbcd 100644 --- a/moto/ec2/responses/customer_gateways.py +++ b/moto/ec2/responses/customer_gateways.py @@ -28,7 +28,7 @@ class CustomerGateways(BaseResponse): CREATE_CUSTOMER_GATEWAY_RESPONSE = """ - + 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE {{ customer_gateway.id }} @@ -50,7 +50,7 @@ CREATE_CUSTOMER_GATEWAY_RESPONSE = """ """ DELETE_CUSTOMER_GATEWAY_RESPONSE = """ - + 7a62c49f-347e-4fc4-9331-6e8eEXAMPLE {{ delete_status }} """ diff --git a/moto/ec2/responses/elastic_block_store.py b/moto/ec2/responses/elastic_block_store.py index 2bb4af3a8..453b7261b 100644 --- a/moto/ec2/responses/elastic_block_store.py +++ b/moto/ec2/responses/elastic_block_store.py @@ -108,7 +108,7 @@ class ElasticBlockStore(BaseResponse): raise NotImplementedError('ElasticBlockStore.reset_snapshot_attribute is not yet implemented') -CREATE_VOLUME_RESPONSE = """ +CREATE_VOLUME_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ volume.id }} {{ volume.size }} @@ -123,7 +123,7 @@ CREATE_VOLUME_RESPONSE = """ +DESCRIBE_VOLUMES_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {% for volume in volumes %} @@ -166,12 +166,12 @@ DESCRIBE_VOLUMES_RESPONSE = """ +DELETE_VOLUME_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE true """ -ATTACHED_VOLUME_RESPONSE = """ +ATTACHED_VOLUME_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ attachment.volume.id }} {{ attachment.instance.id }} @@ -180,7 +180,7 @@ ATTACHED_VOLUME_RESPONSE = """ +DETATCH_VOLUME_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ attachment.volume.id }} {{ attachment.instance.id }} @@ -189,7 +189,7 @@ DETATCH_VOLUME_RESPONSE = """ +CREATE_SNAPSHOT_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ snapshot.id }} {{ snapshot.volume.id }} @@ -201,7 +201,7 @@ CREATE_SNAPSHOT_RESPONSE = """ +DESCRIBE_SNAPSHOTS_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {% for snapshot in snapshots %} @@ -229,13 +229,13 @@ DESCRIBE_SNAPSHOTS_RESPONSE = """ +DELETE_SNAPSHOT_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE true """ DESCRIBE_SNAPSHOT_ATTRIBUTES_RESPONSE = """ - + a9540c9f-161a-45d8-9cc1-1182b89ad69f snap-a0332ee0 {% if not groups %} @@ -254,7 +254,7 @@ DESCRIBE_SNAPSHOT_ATTRIBUTES_RESPONSE = """ """ MODIFY_SNAPSHOT_ATTRIBUTE_RESPONSE = """ - + 666d2944-9276-4d6a-be12-1f4ada972fd8 true diff --git a/moto/ec2/responses/elastic_ip_addresses.py b/moto/ec2/responses/elastic_ip_addresses.py index 6818b7e9d..79d586131 100644 --- a/moto/ec2/responses/elastic_ip_addresses.py +++ b/moto/ec2/responses/elastic_ip_addresses.py @@ -76,7 +76,7 @@ class ElasticIPAddresses(BaseResponse): return self.response_template(RELEASE_ADDRESS_RESPONSE).render() -ALLOCATE_ADDRESS_RESPONSE = """ +ALLOCATE_ADDRESS_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ address.public_ip }} {{ address.domain }} @@ -85,7 +85,7 @@ ALLOCATE_ADDRESS_RESPONSE = """ +ASSOCIATE_ADDRESS_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE true {% if address.association_id %} @@ -93,7 +93,7 @@ ASSOCIATE_ADDRESS_RESPONSE = """ +DESCRIBE_ADDRESS_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {% for address in addresses %} @@ -121,12 +121,12 @@ DESCRIBE_ADDRESS_RESPONSE = """ +DISASSOCIATE_ADDRESS_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE true """ -RELEASE_ADDRESS_RESPONSE = """ +RELEASE_ADDRESS_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE true """ diff --git a/moto/ec2/responses/elastic_network_interfaces.py b/moto/ec2/responses/elastic_network_interfaces.py index 10c5df36d..09d10f451 100644 --- a/moto/ec2/responses/elastic_network_interfaces.py +++ b/moto/ec2/responses/elastic_network_interfaces.py @@ -59,7 +59,7 @@ class ElasticNetworkInterfaces(BaseResponse): raise NotImplementedError('ElasticNetworkInterfaces(AmazonVPC).reset_network_interface_attribute is not yet implemented') CREATE_NETWORK_INTERFACE_RESPONSE = """ - + 2c6021ec-d705-445a-9780-420d0c7ab793 {{ eni.id }} @@ -100,7 +100,7 @@ CREATE_NETWORK_INTERFACE_RESPONSE = """ """ -DESCRIBE_NETWORK_INTERFACES_RESPONSE = """ +DESCRIBE_NETWORK_INTERFACES_RESPONSE = """ ddb0aaf1-8b65-4f0a-94fa-654b18b8a204 {% for eni in enis %} @@ -169,23 +169,23 @@ DESCRIBE_NETWORK_INTERFACES_RESPONSE = """ """ -ATTACH_NETWORK_INTERFACE_RESPONSE = """ +ATTACH_NETWORK_INTERFACE_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ attachment_id }} """ -DETACH_NETWORK_INTERFACE_RESPONSE = """ +DETACH_NETWORK_INTERFACE_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE true """ -MODIFY_NETWORK_INTERFACE_ATTRIBUTE_RESPONSE = """ +MODIFY_NETWORK_INTERFACE_ATTRIBUTE_RESPONSE = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE true """ DELETE_NETWORK_INTERFACE_RESPONSE = """ - + 34b5b3b4-d0c5-49b9-b5e2-a468ef6adcd8 true """ diff --git a/moto/ec2/responses/general.py b/moto/ec2/responses/general.py index b18db7628..9fce05ccf 100644 --- a/moto/ec2/responses/general.py +++ b/moto/ec2/responses/general.py @@ -13,7 +13,7 @@ class General(BaseResponse): GET_CONSOLE_OUTPUT_RESULT = ''' - + 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ instance.id }} 2010-10-14T01:12:41.000Z diff --git a/moto/ec2/responses/instances.py b/moto/ec2/responses/instances.py index fdc2432c6..9f6c188ec 100644 --- a/moto/ec2/responses/instances.py +++ b/moto/ec2/responses/instances.py @@ -185,7 +185,7 @@ class InstanceResponse(BaseResponse): return EC2_MODIFY_INSTANCE_ATTRIBUTE -EC2_RUN_INSTANCES = """ +EC2_RUN_INSTANCES = """ 59dbff89-35bd-4eac-99ed-be587EXAMPLE {{ reservation.id }} 111122223333 @@ -460,7 +460,7 @@ EC2_DESCRIBE_INSTANCES = """