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

Cleanup EC2 classic default security group.

Browse source
This commit is contained in:
Steve Pulec 2015-03-14 18:50:41 -04:00
commit 6c9bba2ca1
4 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
moto/ec2/models.py
View file

@ -1149,6 +1149,10 @@ class SecurityGroupBackend(object):
def __init__(self):
# the key in the dict group is the vpc_id or None (non-vpc)
self.groups = defaultdict(dict)
# Create the default security group
self.create_security_group("default", "The default security group")
super(SecurityGroupBackend, self).__init__()
def create_security_group(self, name, description, vpc_id=None, force=False):
@ -1212,11 +1216,6 @@ class SecurityGroupBackend(object):
if group.name == name:
return group
if name == 'default':
# If the request is for the default group and it does not exist, create it
default_group = self.create_security_group("default", "The default security group", vpc_id=vpc_id, force=True)
return default_group
def get_security_group_by_name_or_id(self, group_name_or_id, vpc_id):
# try searching by id, fallbacks to name search
group = self.get_security_group_from_id(group_name_or_id)