diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-16 03:06:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-16 03:06:10 +0000 |
| commit | ddf1d6ae7e4445cc57f97f52f13c38ca0cc2cd74 (patch) | |
| tree | 36e8a6054e3da774d891fabbb40fd671c733c9a5 /nova/db | |
| parent | 026943be287edaae4a34e430606d4923eb9c9824 (diff) | |
| parent | dd6c1907c6634ccb41c3d94ed3296498e32333b0 (diff) | |
| download | nova-ddf1d6ae7e4445cc57f97f52f13c38ca0cc2cd74.tar.gz nova-ddf1d6ae7e4445cc57f97f52f13c38ca0cc2cd74.tar.xz nova-ddf1d6ae7e4445cc57f97f52f13c38ca0cc2cd74.zip | |
Merge "db api: Remove check for security groups reference"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index bf5847dc3..71a17584e 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -2735,20 +2735,6 @@ def security_group_exists(context, project_id, group_name): def security_group_in_use(context, group_id): session = get_session() with session.begin(): - # Are there any other groups that haven't been deleted - # that include this group in their rules? - rules = session.query(models.SecurityGroupIngressRule).\ - filter_by(group_id=group_id).\ - filter_by(deleted=False).\ - all() - for r in rules: - num_groups = session.query(models.SecurityGroup).\ - filter_by(deleted=False).\ - filter_by(id=r.parent_group_id).\ - count() - if num_groups: - return True - # Are there any instances that haven't been deleted # that include this group? inst_assoc = session.query(models.SecurityGroupInstanceAssociation).\ |