openstack/ec2-api
Code Issues Proposed changes

add filters 'encrypted' and 'volume-type' to volumes

Browse Source 
Change-Id: I2b0a18a30c56206ffe5652cb33f350bf8e764016
This commit is contained in:
Andrey Pavlov 2015-04-02 18:17:49 +03:00
parent 97e72e40d0
commit fdeb9c290b
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ec2api/api/volume.py
View File

@ -111,10 +111,12 @@ class VolumeDescriber(common.TaggableItemsDescriber):
KIND = 'vol'
FILTER_MAP = {'availability-zone': 'availabilityZone',
'create-time': 'createTime',
'encrypted': 'encrypted',
'size': 'size',
'snapshot-id': 'snapshotId',
'status': 'status',
'volume-id': 'volumeId',
'volume-type': 'volumeType',
'attachment.device': ['attachmentSet', 'device'],
'attachment.instance-id': ['attachmentSet', 'instanceId'],
'attachment.status': ['attachmentSet', 'status']}

3
ec2api/tests/unit/test_volume.py
View File

@ -56,11 +56,14 @@ class VolumeTestCase(base.ApiTestCase):
'DescribeVolumes', 'volumeSet',
[('availability-zone', fakes.NAME_AVAILABILITY_ZONE),
('create-time', fakes.TIME_CREATE_VOLUME_2),
('encrypted', False),
# TODO(ft): declare a constant for the volume size in fakes
('size', 1),
('snapshot-id', fakes.ID_EC2_SNAPSHOT_1),
('status', 'available'),
('volume-id', fakes.ID_EC2_VOLUME_1),
# TODO(ft): support filtering by none/empty value
# ('volume-type', ''),
('attachment.device', fakes.ROOT_DEVICE_NAME_INSTANCE_2),
('attachment.instance-id', fakes.ID_EC2_INSTANCE_2),
('attachment.status', 'attached')])