Merge "db.security_group_rule_destroy() method performance optimization"

1 files changed, 6 insertions, 4 deletions

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index a1cca73be..e37ccac92 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -3249,10 +3249,12 @@ def security_group_rule_create(context, values):
 def security_group_rule_destroy(context, security_group_rule_id):
     session = get_session()
     with session.begin():
-        security_group_rule = security_group_rule_get(context,
-                                                      security_group_rule_id,
-                                                      session=session)
-        security_group_rule.delete(session=session)
+        count = _security_group_rule_get_query(context, session=session).\
+                        filter_by(id=security_group_rule_id).\
+                        soft_delete()
+        if count == 0:
+            raise exception.SecurityGroupNotFoundForRule(
+                                               rule_id=security_group_rule_id)
 
 
 @require_context