diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-30 07:33:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-30 07:33:59 +0000 |
| commit | 81ef1db7b0a85719dc53b773bcb576e03221bdf0 (patch) | |
| tree | 71c77f40a969a3c6e1bb9a291c700dd36aff568e | |
| parent | 022d2ef9688c067c92044d2bbf689cd81c1b03e5 (diff) | |
| parent | 8bc5afbb02b491a695206d2930ea981f05b8d3b5 (diff) | |
| download | nova-81ef1db7b0a85719dc53b773bcb576e03221bdf0.tar.gz nova-81ef1db7b0a85719dc53b773bcb576e03221bdf0.tar.xz nova-81ef1db7b0a85719dc53b773bcb576e03221bdf0.zip | |
Merge "Deleting security group does not mark rules as deleted"
| -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 10619c9ed..44f32987a 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): |
