openstack/placement
Code Issues Proposed changes

merge with trunk

Browse Source
This commit is contained in:
William Wolf 2011-09-19 09:25:02 -04:00
commit 4b7b8658be
1 changed files with 2 additions and 0 deletions

2
nova/db/sqlalchemy/api.py

@ -2827,12 +2827,14 @@ def security_group_rule_get_by_security_group(context, security_group_id,
result = session.query(models.SecurityGroupIngressRule).\ result = session.query(models.SecurityGroupIngressRule).\
filter_by(deleted=can_read_deleted(context)).\ filter_by(deleted=can_read_deleted(context)).\
filter_by(parent_group_id=security_group_id).\ filter_by(parent_group_id=security_group_id).\
options(joinedload_all('grantee_group')).\
all() all()
else: else:
# TODO(vish): Join to group and check for project_id # TODO(vish): Join to group and check for project_id
result = session.query(models.SecurityGroupIngressRule).\ result = session.query(models.SecurityGroupIngressRule).\
filter_by(deleted=False).\ filter_by(deleted=False).\
filter_by(parent_group_id=security_group_id).\ filter_by(parent_group_id=security_group_id).\
options(joinedload_all('grantee_group')).\
all() all()
return result return result