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

VPC support for adding rules improving

Browse Source
This commit is contained in:
Jon Haddad 2014-03-20 17:52:49 -07:00
parent cbdc8ba183
commit 2b4fe552d1
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
moto/ec2/models.py
View File

@ -393,7 +393,16 @@ class SecurityGroupBackend(object):
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", force=True)
return default_group return default_group
def authorize_security_group_ingress(self, group_name, group_id, ip_protocol, from_port, to_port, ip_ranges=None, source_group_names=None, vpc_id=None): def authorize_security_group_ingress(self,
group_name,
group_id,
ip_protocol,
from_port,
to_port,
ip_ranges=None,
source_group_names=None,
source_group_ids=None,
vpc_id=None):
# to auth a group in a VPC you need the group_id the name isn't enough # to auth a group in a VPC you need the group_id the name isn't enough
if group_name: if group_name:
@ -407,11 +416,32 @@ class SecurityGroupBackend(object):
if source_group: if source_group:
source_groups.append(source_group) source_groups.append(source_group)
# for VPCs
for source_group_id in source_group_ids:
source_group = self.get_security_group_from_id(source_group_id)
if source_group:
source_groups.append(source_group)
security_rule = SecurityRule(ip_protocol, from_port, to_port, ip_ranges, source_groups) security_rule = SecurityRule(ip_protocol, from_port, to_port, ip_ranges, source_groups)
group.ingress_rules.append(security_rule) group.ingress_rules.append(security_rule)
def revoke_security_group_ingress(self, group_name, group_id, ip_protocol, from_port, to_port, ip_ranges=None, source_group_names=None, vpc_id=None): def revoke_security_group_ingress(self,
group_name,
group_id,
ip_protocol,
from_port,
to_port,
ip_ranges=None,
source_group_names=None,
source_group_ids=None,
vpc_id=None):
if group_name:
group = self.get_security_group_from_name(group_name, vpc_id) group = self.get_security_group_from_name(group_name, vpc_id)
elif group_id:
group = self.get_security_group_from_id(group_id)
source_groups = [] source_groups = []
for source_group_name in source_group_names: for source_group_name in source_group_names:
source_group = self.get_security_group_from_name(source_group_name, vpc_id) source_group = self.get_security_group_from_name(source_group_name, vpc_id)

10
moto/ec2/responses/security_groups.py
View File

@ -22,11 +22,17 @@ def process_rules_from_querystring(querystring):
if 'IpPermissions.1.IpRanges' in key: if 'IpPermissions.1.IpRanges' in key:
ip_ranges.append(value[0]) ip_ranges.append(value[0])
source_groups = [] source_groups = []
source_group_ids = []
for key, value in querystring.iteritems(): for key, value in querystring.iteritems():
if 'IpPermissions.1.Groups' in key: if 'IpPermissions.1.Groups.1.GroupId' in key:
source_group_ids.append(value[0])
elif 'IpPermissions.1.Groups' in key:
source_groups.append(value[0]) source_groups.append(value[0])
return (name, group_id, ip_protocol, from_port, to_port, ip_ranges, source_groups)
return (name, group_id, ip_protocol, from_port, to_port, ip_ranges, source_groups, source_group_ids)
class SecurityGroups(BaseResponse): class SecurityGroups(BaseResponse):