use id instead of name in authorize() and revoke()

closes botogh-561
jtriley · May 9, 2012 · cbdaa83 · cbdaa83
1 parent 30f7389
commit cbdaa83
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/boto/ec2/securitygroup.py b/boto/ec2/securitygroup.py
@@ -151,58 +151,57 @@ def authorize(self, ip_protocol=None, from_port=None, to_port=None,
         :rtype: bool
         :return: True if successful.
         """
+        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
+            if not self.vpc_id:
+                src_group_name = src_group.name
             src_group_owner_id = src_group.owner_id
             if hasattr(src_group, 'group_id'):
                 src_group_group_id = src_group.group_id
             else:
                 src_group_group_id = src_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,
-                                                          src_group_name,
+        status = self.connection.authorize_security_group(None,
+                                                          None,
                                                           src_group_owner_id,
                                                           ip_protocol,
                                                           from_port,
                                                           to_port,
                                                           cidr_ip,
-                                                          None,
+                                                          self.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):
+        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
+            if not self.vpc_id:
+                src_group_name = src_group.name
             src_group_owner_id = src_group.owner_id
             if hasattr(src_group, 'group_id'):
                 src_group_group_id = src_group.group_id
             else:
                 src_group_group_id = src_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,
-                                                       src_group_name,
+        status = self.connection.revoke_security_group(None,
+                                                       None,
                                                        src_group_owner_id,
                                                        ip_protocol,
                                                        from_port,
                                                        to_port,
                                                        cidr_ip,
-                                                       None,
+                                                       self.id,
                                                        src_group_group_id)
         if status:
             self.remove_rule(ip_protocol, from_port, to_port, src_group_name,