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

removed unnecessary itertools chain.

Browse Source 
added success test case around authorize & revoke
This commit is contained in:
Jon Haddad 2014-03-21 13:31:00 -07:00
parent ecaf53fd28
commit 77ab6d2022
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/ec2/models.py
View File

@ -377,7 +377,7 @@ class SecurityGroupBackend(object):
# 2 levels of chaining necessary since it's a complex structure # 2 levels of chaining necessary since it's a complex structure
all_groups = itertools.chain.from_iterable([x.values() for x in self.groups.values()]) all_groups = itertools.chain.from_iterable([x.values() for x in self.groups.values()])
for group in itertools.chain(all_groups): for group in all_groups:
if group.id == group_id: if group.id == group_id:
return group return group
@ -452,7 +452,7 @@ class SecurityGroupBackend(object):
source_group = self.get_security_group_from_id(source_group_id) source_group = self.get_security_group_from_id(source_group_id)
if source_group: if source_group:
source_groups.append(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)
if security_rule in group.ingress_rules: if security_rule in group.ingress_rules:
group.ingress_rules.remove(security_rule) group.ingress_rules.remove(security_rule)

2
tests/test_ec2/test_security_groups.py
View File

@ -142,6 +142,8 @@ def test_authorize_group_in_vpc():
security_group2 = conn.create_security_group('test2', 'test2', vpc_id) security_group2 = conn.create_security_group('test2', 'test2', vpc_id)
success = security_group1.authorize(ip_protocol="tcp", from_port="22", to_port="2222", src_group=security_group2) success = security_group1.authorize(ip_protocol="tcp", from_port="22", to_port="2222", src_group=security_group2)
success.should.be.true
success = security_group1.revoke(ip_protocol="tcp", from_port="22", to_port="2222", src_group=security_group2) success = security_group1.revoke(ip_protocol="tcp", from_port="22", to_port="2222", src_group=security_group2)
success.should.be.true