From 8bc5afbb02b491a695206d2930ea981f05b8d3b5 Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Tue, 25 Sep 2012 11:24:14 -0700 Subject: Deleting security group does not mark rules as deleted Adds query to also delete rules for parent_group_id Fixes bug 1056380 Change-Id: I3d041b49703bf298a80d2ebe19c1298eecf2d98d --- nova/db/sqlalchemy/api.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 3798cade8..da5119930 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3571,6 +3571,12 @@ def security_group_destroy(context, security_group_id): 'deleted_at': timeutils.utcnow(), 'updated_at': literal_column('updated_at')}) + session.query(models.SecurityGroupIngressRule).\ + filter_by(parent_group_id=security_group_id).\ + update({'deleted': True, + 'deleted_at': timeutils.utcnow(), + 'updated_at': literal_column('updated_at')}) + @require_context def security_group_count_by_project(context, project_id, session=None): -- cgit