diff options
| author | Aaron Rosen <arosen@nicira.com> | 2012-09-25 11:24:14 -0700 |
|---|---|---|
| committer | Aaron Rosen <arosen@nicira.com> | 2012-09-25 13:57:34 -0700 |
| commit | 8bc5afbb02b491a695206d2930ea981f05b8d3b5 (patch) | |
| tree | e8424d0d9dd1f51424ae64298bde47d5f1f2a323 | |
| parent | de9f685b8e19a7acc706c1f00cfa743926cf6acc (diff) | |
| download | nova-8bc5afbb02b491a695206d2930ea981f05b8d3b5.tar.gz nova-8bc5afbb02b491a695206d2930ea981f05b8d3b5.tar.xz nova-8bc5afbb02b491a695206d2930ea981f05b8d3b5.zip | |
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
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 6 |
1 files changed, 6 insertions, 0 deletions
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): |