- port_range=None, icmp_type_code=None,
- source_group_name=None, source_group_owner_id=None):
-
- from_port, to_port = self._validate_port_range(port_range)
- icmp_type = self._validate_icmp_type_code(icmp_type_code)
- if icmp_type:
- from_port, to_port = icmp_type[0], icmp_type[1]
-
- if group_name:
- conn = self.driver.euca_shell.get_euca_connection()
- try:
- conn.revoke_security_group(
- group_name=group_name,
- src_security_group_name=source_group_name,
- src_security_group_owner_id=source_group_owner_id,
- ip_protocol=protocol,
- from_port=from_port,
- to_port=to_port,
- cidr_ip=ip,
- )
- except Exception, ex:
- logger.log_exc("Failed to remove rule from group %s" % group_name)
-
+ port_range=None, icmp_type_code=None,
+ source_group_name=None, source_group_owner_id=None):
+ try:
+ from_port, to_port = self._validate_port_range(port_range)
+ icmp_type = self._validate_icmp_type_code(icmp_type_code)
+ if icmp_type:
+ from_port, to_port = icmp_type[0], icmp_type[1]
+ group = self.client.security_groups.find(name=group_name)
+ filter = {
+ 'id': group.id,
+ 'from_port': from_port,
+ 'to_port': to_port,
+ 'cidr_ip': ip,
+ 'ip_protocol': protocol,
+ }
+ rule = self.client.security_group_rules.find(**filter)
+ if rule:
+ self.client.security_group_rules.delete(rule)
+ except Exception as ex:
+ logger.log_exc("Failed to remove rule from group %s" % group_name)