diff options
| author | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-13 09:28:35 +0900 |
|---|---|---|
| committer | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-13 09:28:35 +0900 |
| commit | 7bc94bb337bc3cdb0270a8316f8be097aff26ec1 (patch) | |
| tree | b2ae2e6cd1d9b29d7bbeb3bfe75c2ae4ca18da8f /nova/db | |
| parent | df0be0318cf22d250bdf9abdd9ed3b91bb83f0ea (diff) | |
| parent | 27369c18bde257c068ffc51e5ef51b479ad351d0 (diff) | |
merged with r555
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 c18186c17..6c9989b7b 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -776,12 +776,14 @@ def instance_get_by_id(context, instance_id): if is_admin_context(context): result = session.query(models.Instance).\ options(joinedload('security_groups')).\ + options(joinedload_all('fixed_ip.floating_ips')).\ filter_by(id=instance_id).\ filter_by(deleted=can_read_deleted(context)).\ first() elif is_user_context(context): result = session.query(models.Instance).\ options(joinedload('security_groups')).\ + options(joinedload_all('fixed_ip.floating_ips')).\ filter_by(project_id=context.project_id).\ filter_by(id=instance_id).\ filter_by(deleted=False).\ |