diff options
| author | Jason Koelker <jason@koelker.net> | 2011-09-19 09:35:08 -0500 |
|---|---|---|
| committer | Jason Koelker <jason@koelker.net> | 2011-09-19 09:35:08 -0500 |
| commit | 041b4a64b09941c7168cc5ef0e348a68a2cdab0e (patch) | |
| tree | 54774fb7141bba92fea9d44185f127c4ca5a4bcb /nova/db | |
| parent | bd8133c8a9ca39ae3bb66499975462ccec5f8ca8 (diff) | |
| parent | 0561c0e01822d81fc90fed00f41b8d469c6c7808 (diff) | |
merge the sknurt
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index a119d813a..9d8807489 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -2799,12 +2799,14 @@ 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')).\ 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')).\ all() return result |