Fix the grantee group loading for source groups

Fixes bug 859679. (cherry picked from commit 114ca0b) Change-Id: I92569ecc50fe3e9f17f633df03ee428587749a48
openstack · Oct 18, 2011 · 1f6b213 · 1f6b213
1 parent 44a2a64
commit 1f6b213
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
@@ -2828,14 +2828,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