Fix exception when security group rule already exists

Fixes bug 1082842

Change-Id: I5f51c3637903ff817fb47af82419c453094eb5be

diff --git a/quantum/db/securitygroups_db.py b/quantum/db/securitygroups_db.py
index 94bef9adb974970b3d42175b29decebc2bc34a24..728ff9baf45d50cc23464651231ce665be1ee590 100644 (file)
--- a/quantum/db/securitygroups_db.py
+++ b/quantum/db/securitygroups_db.py
@@ -372,8 +372,9 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
 
             # Check in database if rule exists
             filters = self._make_security_group_rule_filter_dict(i)
-            if self.get_security_group_rules(context, filters):
-                raise ext_sg.SecurityGroupRuleExists(rule=i)
+            rules = self.get_security_group_rules(context, filters)
+            if rules:
+                raise ext_sg.SecurityGroupRuleExists(id=str(rules[0]['id']))
 
     def get_security_group_rules(self, context, filters=None, fields=None):
         return self._get_collection(context, SecurityGroupRule,

diff --git a/quantum/extensions/securitygroup.py b/quantum/extensions/securitygroup.py
index 6d647abe1f05f846c995172ef079c76fb217dad3..8e8ca66f26ca57884c4a7999e56817c5b4916f9a 100644 (file)
--- a/quantum/extensions/securitygroup.py
+++ b/quantum/extensions/securitygroup.py
@@ -101,7 +101,7 @@ class DuplicateSecurityGroupRuleInPost(qexception.InUse):
 
 
 class SecurityGroupRuleExists(qexception.InUse):
-    message = _("Security group rule exists %(rule)s")
+    message = _("Security group rule already exists. Group id is %(id)s.")
 
 
 class SecurityGroupProxyMode(qexception.InUse):