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

Add EBS snapshot filter. Closes #525.

Browse Source
This commit is contained in:
Steve Pulec 2016-05-01 22:24:49 -04:00
parent 0a10b2f738
commit d82d64b8bd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/ec2/models.py
View File

@ -1158,7 +1158,6 @@ class SecurityGroup(TaggedEC2Resource):
def delete(self, region_name): def delete(self, region_name):
''' Not exposed as part of the ELB API - used for CloudFormation. ''' ''' Not exposed as part of the ELB API - used for CloudFormation. '''
backend = ec2_backends[region_name]
self.ec2_backend.delete_security_group(group_id=self.id) self.ec2_backend.delete_security_group(group_id=self.id)
@property @property
@ -1570,6 +1569,7 @@ class Snapshot(TaggedEC2Resource):
self.start_time = utc_date_and_time() self.start_time = utc_date_and_time()
self.create_volume_permission_groups = set() self.create_volume_permission_groups = set()
self.ec2_backend = ec2_backend self.ec2_backend = ec2_backend
self.status = 'completed'
def get_filter_value(self, filter_name): def get_filter_value(self, filter_name):
@ -2023,6 +2023,7 @@ class SubnetBackend(object):
raise InvalidParameterValueError(map_public_ip) raise InvalidParameterValueError(map_public_ip)
subnet.map_public_ip_on_launch = map_public_ip subnet.map_public_ip_on_launch = map_public_ip
class SubnetRouteTableAssociation(object): class SubnetRouteTableAssociation(object):
def __init__(self, route_table_id, subnet_id): def __init__(self, route_table_id, subnet_id):
self.route_table_id = route_table_id self.route_table_id = route_table_id

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

@ -208,7 +208,7 @@ DESCRIBE_SNAPSHOTS_RESPONSE = """<DescribeSnapshotsResponse xmlns="http://ec2.am
<item> <item>
<snapshotId>{{ snapshot.id }}</snapshotId> <snapshotId>{{ snapshot.id }}</snapshotId>
<volumeId>{{ snapshot.volume.id }}</volumeId> <volumeId>{{ snapshot.volume.id }}</volumeId>
<status>completed</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>111122223333</ownerId>