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

Merge pull request #2096 from tay-bird/fix-describe-volumes-response-with-no-tags

Browse Source 
Fix describe volumes response with no tags
This commit is contained in:
Mike Grima 2019-03-11 13:44:15 -07:00 committed by GitHub
commit fe42309534
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,16 +150,18 @@ CREATE_VOLUME_RESPONSE = """<CreateVolumeResponse xmlns="http://ec2.amazonaws.co
<availabilityZone>{{ volume.zone.name }}</availabilityZone> <availabilityZone>{{ volume.zone.name }}</availabilityZone>
<status>creating</status> <status>creating</status>
<createTime>{{ volume.create_time}}</createTime> <createTime>{{ volume.create_time}}</createTime>
<tagSet> {% if volume.get_tags() %}
{% for tag in volume.get_tags() %} <tagSet>
<item> {% for tag in volume.get_tags() %}
<resourceId>{{ tag.resource_id }}</resourceId> <item>
<resourceType>{{ tag.resource_type }}</resourceType> <resourceId>{{ tag.resource_id }}</resourceId>
<key>{{ tag.key }}</key> <resourceType>{{ tag.resource_type }}</resourceType>
<value>{{ tag.value }}</value> <key>{{ tag.key }}</key>
</item> <value>{{ tag.value }}</value>
{% endfor %} </item>
</tagSet> {% endfor %}
</tagSet>
{% endif %}
<volumeType>standard</volumeType> <volumeType>standard</volumeType>
</CreateVolumeResponse>""" </CreateVolumeResponse>"""
@ -191,16 +193,18 @@ DESCRIBE_VOLUMES_RESPONSE = """<DescribeVolumesResponse xmlns="http://ec2.amazon
</item> </item>
{% endif %} {% endif %}
</attachmentSet> </attachmentSet>
<tagSet> {% if volume.get_tags() %}
{% for tag in volume.get_tags() %} <tagSet>
<item> {% for tag in volume.get_tags() %}
<resourceId>{{ tag.resource_id }}</resourceId> <item>
<resourceType>{{ tag.resource_type }}</resourceType> <resourceId>{{ tag.resource_id }}</resourceId>
<key>{{ tag.key }}</key> <resourceType>{{ tag.resource_type }}</resourceType>
<value>{{ tag.value }}</value> <key>{{ tag.key }}</key>
</item> <value>{{ tag.value }}</value>
{% endfor %} </item>
</tagSet> {% endfor %}
</tagSet>
{% endif %}
<volumeType>standard</volumeType> <volumeType>standard</volumeType>
</item> </item>
{% endfor %} {% endfor %}

24
tests/test_ec2/test_elastic_block_store.py
View File

@ -589,6 +589,18 @@ def test_volume_tag_escaping():
dict(snaps[0].tags).should.equal({'key': '</closed>'}) dict(snaps[0].tags).should.equal({'key': '</closed>'})
@mock_ec2
def test_volume_property_hidden_when_no_tags_exist():
ec2_client = boto3.client('ec2', region_name='us-east-1')
volume_response = ec2_client.create_volume(
Size=10,
AvailabilityZone='us-east-1a'
)
volume_response.get('Tags').should.equal(None)
@freeze_time @freeze_time
@mock_ec2 @mock_ec2
def test_copy_snapshot(): def test_copy_snapshot():
@ -602,26 +614,26 @@ def test_copy_snapshot():
create_snapshot_response = ec2_client.create_snapshot( create_snapshot_response = ec2_client.create_snapshot(
VolumeId=volume_response['VolumeId'] VolumeId=volume_response['VolumeId']
) )
copy_snapshot_response = dest_ec2_client.copy_snapshot( copy_snapshot_response = dest_ec2_client.copy_snapshot(
SourceSnapshotId=create_snapshot_response['SnapshotId'], SourceSnapshotId=create_snapshot_response['SnapshotId'],
SourceRegion="eu-west-1" SourceRegion="eu-west-1"
) )
ec2 = boto3.resource('ec2', region_name='eu-west-1') ec2 = boto3.resource('ec2', region_name='eu-west-1')
dest_ec2 = boto3.resource('ec2', region_name='eu-west-2') dest_ec2 = boto3.resource('ec2', region_name='eu-west-2')
source = ec2.Snapshot(create_snapshot_response['SnapshotId']) source = ec2.Snapshot(create_snapshot_response['SnapshotId'])
dest = dest_ec2.Snapshot(copy_snapshot_response['SnapshotId']) dest = dest_ec2.Snapshot(copy_snapshot_response['SnapshotId'])
attribs = ['data_encryption_key_id', 'encrypted', attribs = ['data_encryption_key_id', 'encrypted',
'kms_key_id', 'owner_alias', 'owner_id', 'kms_key_id', 'owner_alias', 'owner_id',
'progress', 'state', 'state_message', 'progress', 'state', 'state_message',
'tags', 'volume_id', 'volume_size'] 'tags', 'volume_id', 'volume_size']
for attrib in attribs: for attrib in attribs:
getattr(source, attrib).should.equal(getattr(dest, attrib)) getattr(source, attrib).should.equal(getattr(dest, attrib))
# Copy from non-existent source ID. # Copy from non-existent source ID.
with assert_raises(ClientError) as cm: with assert_raises(ClientError) as cm:
create_snapshot_error = ec2_client.create_snapshot( create_snapshot_error = ec2_client.create_snapshot(