From eb474882d29c3266adf91dd00f02ce3c00c21271 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Sun, 25 Nov 2012 15:43:21 +0000 Subject: [PATCH] Fix exception when security group rule already exists Fixes bug 1082842 Change-Id: I5f51c3637903ff817fb47af82419c453094eb5be --- quantum/db/securitygroups_db.py | 5 +++-- quantum/extensions/securitygroup.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/quantum/db/securitygroups_db.py b/quantum/db/securitygroups_db.py index 94bef9adb..728ff9baf 100644 --- 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 6d647abe1..8e8ca66f2 100644 --- 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): -- 2.45.2