openstack/nova
Code Issues Proposed changes

Merge "Make instance_system_metadata load with instance"

Browse Source
This commit is contained in:
Jenkins 2012-11-12 18:14:27 +00:00 committed by Gerrit Code Review
commit 411ee404f5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/db/sqlalchemy/api.py
View File

@ -1462,7 +1462,8 @@ def _build_instance_get(context, session=None):
options(joinedload_all('security_groups.rules')).\
options(joinedload('info_cache')).\
options(joinedload('metadata')).\
options(joinedload('instance_type'))
options(joinedload('instance_type')).\
options(joinedload('system_metadata'))
@require_context
@ -1495,6 +1496,7 @@ def instance_get_all_by_filters(context, filters, sort_key, sort_dir,
query_prefix = session.query(models.Instance).\
options(joinedload('info_cache')).\
options(joinedload('security_groups')).\
options(joinedload('system_metadata')).\
options(joinedload('metadata')).\
options(joinedload('instance_type')).\
order_by(sort_fn[sort_dir](getattr(models.Instance, sort_key)))