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

ebs model now supports encrpyted volumes

Browse Source
This commit is contained in:
Kieran Doonan 2016-07-04 11:23:46 +01:00
parent 8ccc210eef
commit e8a564b6b4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/ec2/models.py
View File

@ -1534,7 +1534,7 @@ class VolumeAttachment(object):
class Volume(TaggedEC2Resource): class Volume(TaggedEC2Resource):
def __init__(self, ec2_backend, volume_id, size, zone, snapshot_id=None): def __init__(self, ec2_backend, volume_id, size, zone, snapshot_id=None, encrypted=False):
self.id = volume_id self.id = volume_id
self.size = size self.size = size
self.zone = zone self.zone = zone
@ -1542,6 +1542,7 @@ class Volume(TaggedEC2Resource):
self.attachment = None self.attachment = None
self.snapshot_id = snapshot_id self.snapshot_id = snapshot_id
self.ec2_backend = ec2_backend self.ec2_backend = ec2_backend
self.encrypted = encrypted
@classmethod @classmethod
def create_from_cloudformation_json(cls, resource_name, cloudformation_json, region_name): def create_from_cloudformation_json(cls, resource_name, cloudformation_json, region_name):
@ -1591,6 +1592,9 @@ class Volume(TaggedEC2Resource):
if filter_name == 'volume-id': if filter_name == 'volume-id':
return self.id return self.id
if filter_name == 'encrypted':
return str(self.encrypted).lower()
filter_value = super(Volume, self).get_filter_value(filter_name) filter_value = super(Volume, self).get_filter_value(filter_name)
if filter_value is None: if filter_value is None: