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

Change SecurityGroupBackend.{authorize,revoke}_security_group_ingress() methods to receive group name or id, never both

Browse source
This commit is contained in:
Hugo Lopes Tavares 2015-02-25 18:11:00 -05:00
commit 4beda26007
3 changed files with 82 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,14 +4,10 @@ from moto.ec2.utils import filters_from_querystring
def process_rules_from_querystring(querystring):
name = None
group_id = None
try:
name = querystring.get('GroupName')[0]
group_name_or_id = querystring.get('GroupName')[0]
except:
group_id = querystring.get('GroupId')[0]
group_name_or_id = querystring.get('GroupId')[0]
ip_protocol = querystring.get('IpPermissions.1.IpProtocol')[0]
from_port = querystring.get('IpPermissions.1.FromPort')[0]
@ -30,7 +26,7 @@ def process_rules_from_querystring(querystring):
elif 'IpPermissions.1.Groups' in key:
source_groups.append(value[0])
return (name, group_id, ip_protocol, from_port, to_port, ip_ranges, source_groups, source_group_ids)
return (group_name_or_id, ip_protocol, from_port, to_port, ip_ranges, source_groups, source_group_ids)
class SecurityGroups(BaseResponse):