2to3 -f except

[sfa.git] / sfa / openstack / security_group.py

diff --git a/sfa/openstack/security_group.py b/sfa/openstack/security_group.py
index 842b889..6aced8c 100644 (file)
--- a/sfa/openstack/security_group.py
+++ b/sfa/openstack/security_group.py
@@ -9,13 +9,15 @@ class SecurityGroup:
     def create_security_group(self, name):
         try:
             self.client.security_groups.create(name=name, description=name)
-        except Exception, ex:
+        except Exception as ex:
             logger.log_exc("Failed to add security group")
+            raise
 
     def delete_security_group(self, name):
         try:
-            self.client.security_groups.delete(name)
-        except Exception, ex:
+            security_group = self.client.security_groups.find(name=name)
+            self.client.security_groups.delete(security_group.id)
+        except Exception as ex:
             logger.log_exc("Failed to delete security group")
 
 
@@ -54,14 +56,9 @@ class SecurityGroup:
                 from_port, to_port = icmp_type[0], icmp_type[1]
 
             group = self.client.security_groups.find(name=group_name)
-            self.client.security_group_rules.create(
-                    group_id=group.id,    
-                    ip_protocol=protocol,
-                    from_port=from_port,
-                    to_port=to_port,
-                    cidr_ip=cidr_ip,
-                    )
-        except Exception, ex:
+            self.client.security_group_rules.create(group.id, \
+                                protocol, from_port, to_port,cidr_ip)
+        except Exception as ex:
             logger.log_exc("Failed to add rule to group %s" % group_name)
 
 
@@ -78,12 +75,12 @@ class SecurityGroup:
                 'id': group.id,   
                 'from_port': from_port,
                 'to_port': to_port,
-                'cird_ip': ip,
+                '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, ex:
+        except Exception as ex:
             logger.log_exc("Failed to remove rule from group %s" % group_name)