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

Standardize on one account id (123456789012).

Browse Source
This commit is contained in:
Steve Pulec 2017-03-15 22:21:04 -04:00
parent e9e49c5916
commit 5f3fbff627
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/ec2/responses/amis.py
View File

@ -100,7 +100,7 @@ DESCRIBE_IMAGES_RESPONSE = """<DescribeImagesResponse xmlns="http://ec2.amazonaw
<imageId>{{ image.id }}</imageId> <imageId>{{ image.id }}</imageId>
<imageLocation>amazon/getting-started</imageLocation> <imageLocation>amazon/getting-started</imageLocation>
<imageState>{{ image.state }}</imageState> <imageState>{{ image.state }}</imageState>
<imageOwnerId>111122223333</imageOwnerId> <imageOwnerId>123456789012</imageOwnerId>
<isPublic>{{ image.is_public_string }}</isPublic> <isPublic>{{ image.is_public_string }}</isPublic>
<architecture>{{ image.architecture }}</architecture> <architecture>{{ image.architecture }}</architecture>
<imageType>machine</imageType> <imageType>machine</imageType>

4
moto/ec2/responses/elastic_block_store.py
View File

@ -228,7 +228,7 @@ CREATE_SNAPSHOT_RESPONSE = """<CreateSnapshotResponse xmlns="http://ec2.amazonaw
<status>pending</status> <status>pending</status>
<startTime>{{ snapshot.start_time}}</startTime> <startTime>{{ snapshot.start_time}}</startTime>
<progress>60%</progress> <progress>60%</progress>
<ownerId>111122223333</ownerId> <ownerId>123456789012</ownerId>
<volumeSize>{{ snapshot.volume.size }}</volumeSize> <volumeSize>{{ snapshot.volume.size }}</volumeSize>
<description>{{ snapshot.description }}</description> <description>{{ snapshot.description }}</description>
<encrypted>{{ snapshot.encrypted }}</encrypted> <encrypted>{{ snapshot.encrypted }}</encrypted>
@ -244,7 +244,7 @@ DESCRIBE_SNAPSHOTS_RESPONSE = """<DescribeSnapshotsResponse xmlns="http://ec2.am
<status>{{ snapshot.status }}</status> <status>{{ snapshot.status }}</status>
<startTime>{{ snapshot.start_time}}</startTime> <startTime>{{ snapshot.start_time}}</startTime>
<progress>100%</progress> <progress>100%</progress>
<ownerId>111122223333</ownerId> <ownerId>123456789012</ownerId>
<volumeSize>{{ snapshot.volume.size }}</volumeSize> <volumeSize>{{ snapshot.volume.size }}</volumeSize>
<description>{{ snapshot.description }}</description> <description>{{ snapshot.description }}</description>
<encrypted>{{ snapshot.encrypted }}</encrypted> <encrypted>{{ snapshot.encrypted }}</encrypted>

16
moto/ec2/responses/instances.py
View File

@ -209,7 +209,7 @@ class InstanceResponse(BaseResponse):
EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/"> EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
<requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId> <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
<reservationId>{{ reservation.id }}</reservationId> <reservationId>{{ reservation.id }}</reservationId>
<ownerId>111122223333</ownerId> <ownerId>123456789012</ownerId>
<groupSet> <groupSet>
<item> <item>
<groupId>sg-245f6a01</groupId> <groupId>sg-245f6a01</groupId>
@ -280,7 +280,7 @@ EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc
<vpcId>{{ nic.subnet.vpc_id }}</vpcId> <vpcId>{{ nic.subnet.vpc_id }}</vpcId>
{% endif %} {% endif %}
<description>Primary network interface</description> <description>Primary network interface</description>
<ownerId>111122223333</ownerId> <ownerId>123456789012</ownerId>
<status>in-use</status> <status>in-use</status>
<macAddress>1b:2b:3c:4d:5e:6f</macAddress> <macAddress>1b:2b:3c:4d:5e:6f</macAddress>
<privateIpAddress>{{ nic.private_ip_address }}</privateIpAddress> <privateIpAddress>{{ nic.private_ip_address }}</privateIpAddress>
@ -303,7 +303,7 @@ EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc
{% if nic.public_ip %} {% if nic.public_ip %}
<association> <association>
<publicIp>{{ nic.public_ip }}</publicIp> <publicIp>{{ nic.public_ip }}</publicIp>
<ipOwnerId>111122223333</ipOwnerId> <ipOwnerId>123456789012</ipOwnerId>
</association> </association>
{% endif %} {% endif %}
<privateIpAddressesSet> <privateIpAddressesSet>
@ -313,7 +313,7 @@ EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc
{% if nic.public_ip %} {% if nic.public_ip %}
<association> <association>
<publicIp>{{ nic.public_ip }}</publicIp> <publicIp>{{ nic.public_ip }}</publicIp>
<ipOwnerId>111122223333</ipOwnerId> <ipOwnerId>123456789012</ipOwnerId>
</association> </association>
{% endif %} {% endif %}
</item> </item>
@ -332,7 +332,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
{% for reservation in reservations %} {% for reservation in reservations %}
<item> <item>
<reservationId>{{ reservation.id }}</reservationId> <reservationId>{{ reservation.id }}</reservationId>
<ownerId>111122223333</ownerId> <ownerId>123456789012</ownerId>
<groupSet> <groupSet>
{% for group in reservation.dynamic_group_list %} {% for group in reservation.dynamic_group_list %}
<item> <item>
@ -441,7 +441,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
<vpcId>{{ nic.subnet.vpc_id }}</vpcId> <vpcId>{{ nic.subnet.vpc_id }}</vpcId>
{% endif %} {% endif %}
<description>Primary network interface</description> <description>Primary network interface</description>
<ownerId>111122223333</ownerId> <ownerId>123456789012</ownerId>
<status>in-use</status> <status>in-use</status>
<macAddress>1b:2b:3c:4d:5e:6f</macAddress> <macAddress>1b:2b:3c:4d:5e:6f</macAddress>
<privateIpAddress>{{ nic.private_ip_address }}</privateIpAddress> <privateIpAddress>{{ nic.private_ip_address }}</privateIpAddress>
@ -468,7 +468,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
{% if nic.public_ip %} {% if nic.public_ip %}
<association> <association>
<publicIp>{{ nic.public_ip }}</publicIp> <publicIp>{{ nic.public_ip }}</publicIp>
<ipOwnerId>111122223333</ipOwnerId> <ipOwnerId>123456789012</ipOwnerId>
</association> </association>
{% endif %} {% endif %}
<privateIpAddressesSet> <privateIpAddressesSet>
@ -478,7 +478,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
{% if nic.public_ip %} {% if nic.public_ip %}
<association> <association>
<publicIp>{{ nic.public_ip }}</publicIp> <publicIp>{{ nic.public_ip }}</publicIp>
<ipOwnerId>111122223333</ipOwnerId> <ipOwnerId>123456789012</ipOwnerId>
</association> </association>
{% endif %} {% endif %}
</item> </item>

6
moto/ec2/responses/security_groups.py
View File

@ -142,7 +142,7 @@ DESCRIBE_SECURITY_GROUPS_RESPONSE = """<DescribeSecurityGroupsResponse xmlns="ht
<securityGroupInfo> <securityGroupInfo>
{% for group in groups %} {% for group in groups %}
<item> <item>
<ownerId>111122223333</ownerId> <ownerId>123456789012</ownerId>
<groupId>{{ group.id }}</groupId> <groupId>{{ group.id }}</groupId>
<groupName>{{ group.name }}</groupName> <groupName>{{ group.name }}</groupName>
<groupDescription>{{ group.description }}</groupDescription> <groupDescription>{{ group.description }}</groupDescription>
@ -162,7 +162,7 @@ DESCRIBE_SECURITY_GROUPS_RESPONSE = """<DescribeSecurityGroupsResponse xmlns="ht
<groups> <groups>
{% for source_group in rule.source_groups %} {% for source_group in rule.source_groups %}
<item> <item>
<userId>111122223333</userId> <userId>123456789012</userId>
<groupId>{{ source_group.id }}</groupId> <groupId>{{ source_group.id }}</groupId>
<groupName>{{ source_group.name }}</groupName> <groupName>{{ source_group.name }}</groupName>
</item> </item>
@ -187,7 +187,7 @@ DESCRIBE_SECURITY_GROUPS_RESPONSE = """<DescribeSecurityGroupsResponse xmlns="ht
<groups> <groups>
{% for source_group in rule.source_groups %} {% for source_group in rule.source_groups %}
<item> <item>
<userId>111122223333</userId> <userId>123456789012</userId>
<groupId>{{ source_group.id }}</groupId> <groupId>{{ source_group.id }}</groupId>
<groupName>{{ source_group.name }}</groupName> <groupName>{{ source_group.name }}</groupName>
</item> </item>

2
moto/ec2/responses/vpc_peering_connections.py
View File

@ -78,7 +78,7 @@ DESCRIBE_VPC_PEERING_CONNECTIONS_RESPONSE = """
<cidrBlock>{{ vpc_pcx.vpc.cidr_block }}</cidrBlock> <cidrBlock>{{ vpc_pcx.vpc.cidr_block }}</cidrBlock>
</requesterVpcInfo> </requesterVpcInfo>
<accepterVpcInfo> <accepterVpcInfo>
<ownerId>111122223333</ownerId> <ownerId>123456789012</ownerId>
<vpcId>{{ vpc_pcx.peer_vpc.id }}</vpcId> <vpcId>{{ vpc_pcx.peer_vpc.id }}</vpcId>
</accepterVpcInfo> </accepterVpcInfo>
<status> <status>

2
moto/s3/responses.py
View File

@ -985,7 +985,7 @@ S3_ALL_MULTIPARTS = """<?xml version="1.0" encoding="UTF-8"?>
<Key>{{ upload.key_name }}</Key> <Key>{{ upload.key_name }}</Key>
<UploadId>{{ upload.id }}</UploadId> <UploadId>{{ upload.id }}</UploadId>
<Initiator> <Initiator>
<ID>arn:aws:iam::111122223333:user/user1-11111a31-17b5-4fb7-9df5-b111111f13de</ID> <ID>arn:aws:iam::123456789012:user/user1-11111a31-17b5-4fb7-9df5-b111111f13de</ID>
<DisplayName>user1-11111a31-17b5-4fb7-9df5-b111111f13de</DisplayName> <DisplayName>user1-11111a31-17b5-4fb7-9df5-b111111f13de</DisplayName>
</Initiator> </Initiator>
<Owner> <Owner>