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

Merge pull request #198 from DreadPirateShawn/VPCDefaultSecurityGroup

Browse Source 
VPC: Added default security group upon creation.
This commit is contained in:
Steve Pulec 2014-09-10 20:57:47 -04:00
commit b8afb3be90
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
moto/ec2/models.py
View File

@ -856,7 +856,7 @@ class SecurityGroupBackend(object):
if name == 'default': if name == 'default':
# If the request is for the default group and it does not exist, create it # If the request is for the default group and it does not exist, create it
default_group = ec2_backend.create_security_group("default", "The default security group", force=True) default_group = ec2_backend.create_security_group("default", "The default security group", vpc_id=vpc_id, force=True)
return default_group return default_group
def authorize_security_group_ingress(self, def authorize_security_group_ingress(self,
@ -1115,9 +1115,13 @@ class VPCBackend(object):
vpc = VPC(vpc_id, cidr_block) vpc = VPC(vpc_id, cidr_block)
self.vpcs[vpc_id] = vpc self.vpcs[vpc_id] = vpc
# AWS creates a default main route table. # AWS creates a default main route table and security group.
main_route_table = self.create_route_table(vpc_id, main=True) main_route_table = self.create_route_table(vpc_id, main=True)
default = ec2_backend.get_security_group_from_name('default', vpc_id=vpc_id)
if not default:
ec2_backend.create_security_group('default', 'default VPC security group', vpc_id=vpc_id)
return vpc return vpc
def get_vpc(self, vpc_id): def get_vpc(self, vpc_id):
@ -1139,6 +1143,11 @@ class VPCBackend(object):
for route_table in route_tables: for route_table in route_tables:
ec2_backend.delete_route_table(route_table.id) ec2_backend.delete_route_table(route_table.id)
# Delete default security group if exists.
default = ec2_backend.get_security_group_from_name('default', vpc_id=vpc_id)
if default:
ec2_backend.delete_security_group(group_id=default.id)
# Now delete VPC. # Now delete VPC.
vpc = self.vpcs.pop(vpc_id, None) vpc = self.vpcs.pop(vpc_id, None)
if not vpc: if not vpc:

16
tests/test_ec2/test_vpcs.py
View File

@ -31,6 +31,22 @@ def test_vpcs():
cm.exception.request_id.should_not.be.none cm.exception.request_id.should_not.be.none
@mock_ec2
def test_vpc_defaults():
conn = boto.connect_vpc('the_key', 'the_secret')
vpc = conn.create_vpc("10.0.0.0/16")
conn.get_all_vpcs().should.have.length_of(1)
conn.get_all_route_tables().should.have.length_of(1)
conn.get_all_security_groups().should.have.length_of(1)
vpc.delete()
conn.get_all_vpcs().should.have.length_of(0)
conn.get_all_route_tables().should.have.length_of(0)
conn.get_all_security_groups().should.have.length_of(0)
@mock_ec2 @mock_ec2
def test_vpc_tagging(): def test_vpc_tagging():
conn = boto.connect_vpc() conn = boto.connect_vpc()