diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-01-12 12:29:28 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-01-12 12:29:28 +0100 |
| commit | ef86d16f15276581932ab50029e895c9cbf655af (patch) | |
| tree | 68f4bbdef870c986a29aa2888b74b4c05bb6ec37 | |
| parent | 76fdd667f2efe7e2dc710fe0254437d176efb45c (diff) | |
| download | nova-ef86d16f15276581932ab50029e895c9cbf655af.tar.gz nova-ef86d16f15276581932ab50029e895c9cbf655af.tar.xz nova-ef86d16f15276581932ab50029e895c9cbf655af.zip | |
Eagerly load fixed_ip property of instances.
| -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 4561fa219..cee6121a9 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -756,12 +756,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('fixed_ip')).\ 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('fixed_ip')).\ filter_by(project_id=context.project_id).\ filter_by(id=instance_id).\ filter_by(deleted=False).\ |