Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update authorize, revoke, and delete convenience methods to support VPC-linked groups #740

Merged
merged 5 commits into from May 14, 2012
Merged

update authorize, revoke, and delete convenience methods to support VPC-linked groups #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4f4cfc
fix AttributeError when src_group is not GroupOrCIDR
jtriley May 9, 2012
30f7389
use id instead of name in SecurityGroup.delete()
jtriley May 9, 2012
cbdaa83
use id instead of name in authorize() and revoke()
jtriley May 9, 2012
72d4f5f
only use group id on VPC-linked security groups
jtriley May 14, 2012
6c7c864
add vpc_id to VPC-linked group obj before returning
jtriley May 14, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions boto/ec2/connection.py
View file
Open in desktop
Expand Up @@ -2002,6 +2002,8 @@ def create_security_group(self, name, description, vpc_id=None):
SecurityGroup, verb='POST')
group.name = name
group.description = description
if vpc_id is not None:
group.vpc_id = vpc_id
return group

def delete_security_group(self, name=None, group_id=None):
Expand Down
60 changes: 41 additions & 19 deletions boto/ec2/securitygroup.py
View file
Open in desktop
Expand Up @@ -82,7 +82,10 @@ def endElement(self, name, value, connection):
setattr(self, name, value)

def delete(self):
return self.connection.delete_security_group(self.name)
if self.vpc_id:
return self.connection.delete_security_group(group_id=self.id)
else:
return self.connection.delete_security_group(self.name)

def add_rule(self, ip_protocol, from_port, to_port,
src_group_name, src_group_owner_id, cidr_ip, src_group_group_id):
Expand Down Expand Up @@ -151,52 +154,71 @@ def authorize(self, ip_protocol=None, from_port=None, to_port=None,
:rtype: bool
:return: True if successful.
"""
group_name = None
if not self.vpc_id:
group_name = self.name
group_id = None
if self.vpc_id:
group_id = self.id
src_group_name = None
src_group_owner_id = None
src_group_group_id = None
if src_group:
cidr_ip = None
src_group_name = src_group.name
src_group_owner_id = src_group.owner_id
src_group_group_id = src_group.group_id
else:
src_group_name = None
src_group_owner_id = None
src_group_group_id = None
status = self.connection.authorize_security_group(self.name,
if not self.vpc_id:
src_group_name = src_group.name
else:
if hasattr(src_group, 'group_id'):
src_group_group_id = src_group.group_id
else:
src_group_group_id = src_group.id
status = self.connection.authorize_security_group(group_name,
src_group_name,
src_group_owner_id,
ip_protocol,
from_port,
to_port,
cidr_ip,
None,
group_id,
src_group_group_id)
if status:
if type(cidr_ip) != list:
cidr_ip = [cidr_ip]
for single_cidr_ip in cidr_ip:
self.add_rule(ip_protocol, from_port, to_port, src_group_name,
src_group_owner_id, single_cidr_ip, src_group_group_id)

return status

def revoke(self, ip_protocol=None, from_port=None, to_port=None,
cidr_ip=None, src_group=None):
group_name = None
if not self.vpc_id:
group_name = self.name
group_id = None
if self.vpc_id:
group_id = self.id
src_group_name = None
src_group_owner_id = None
src_group_group_id = None
if src_group:
cidr_ip=None
src_group_name = src_group.name
cidr_ip = None
src_group_owner_id = src_group.owner_id
src_group_group_id = src_group.group_id
else:
src_group_name = None
src_group_owner_id = None
src_group_group_id = None
status = self.connection.revoke_security_group(self.name,
if not self.vpc_id:
src_group_name = src_group.name
else:
if hasattr(src_group, 'group_id'):
src_group_group_id = src_group.group_id
else:
src_group_group_id = src_group.id
status = self.connection.revoke_security_group(group_name,
src_group_name,
src_group_owner_id,
ip_protocol,
from_port,
to_port,
cidr_ip,
None,
group_id,
src_group_group_id)
if status:
self.remove_rule(ip_protocol, from_port, to_port, src_group_name,
Expand Down