catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated SC methods to work with a group_id, which must be used if it's a group in a VPC

Browse source
This commit is contained in:
Jon Haddad 2013-12-06 14:34:13 -08:00
commit 48ee4b600b
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
moto/ec2/models.py
View file

@ -331,15 +331,17 @@ class SecurityGroupBackend(object):
def describe_security_groups(self):
return itertools.chain(*[x.values() for x in self.groups.values()])
def delete_security_group(self, name_or_group_id, vpc_id):
if name_or_group_id in self.groups[vpc_id]:
# Group Id
return self.groups[vpc_id].pop(name_or_group_id)
else:
# Group Name
group = self.get_security_group_from_name(name_or_group_id, vpc_id)
def delete_security_group(self, name=None, group_id=None):
if group_id:
# loop over all the SGs, find the right one
for vpc in self.groups.values():
if group_id in vpc:
return vpc.pop(group_id)
elif name:
# Group Name. Has to be in standard EC2, VPC needs to be identified by group_id
group = self.get_security_group_from_name(name, None)
if group:
return self.groups[vpc_id].pop(group.id)
return self.groups[None].pop(group.id)
def get_security_group_from_name(self, name, vpc_id):
for group_id, group in self.groups[vpc_id].iteritems():