diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 4b79cbe51..8e5df8dd8 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -2782,14 +2782,13 @@ def security_group_rule_get_by_security_group(context, security_group_id, result = session.query(models.SecurityGroupIngressRule).\ filter_by(deleted=can_read_deleted(context)).\ filter_by(parent_group_id=security_group_id).\ - options(joinedload_all('grantee_group')).\ + options(joinedload_all('grantee_group.instances')).\ all() else: - # TODO(vish): Join to group and check for project_id result = session.query(models.SecurityGroupIngressRule).\ filter_by(deleted=False).\ filter_by(parent_group_id=security_group_id).\ - options(joinedload_all('grantee_group')).\ + options(joinedload_all('grantee_group.instances')).\ all() return result