From a7464120c78d4c3dae0ca39077b2e28e42f4b87f Mon Sep 17 00:00:00 2001 From: Andrew Laski Date: Tue, 5 Apr 2016 14:19:13 -0400 Subject: [PATCH] Update get_by_project_id on InstanceMappingList The get_by_project_id method of InstanceMappingList was not previously updated to account for backrefs being added. This fixes that, and brings the actual method in line with the unit test. The method was broken before but it was not exposed. Change-Id: I5ca7549bdb1a91011494bc9eb64ca350ca275b54 --- nova/objects/instance_mapping.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nova/objects/instance_mapping.py b/nova/objects/instance_mapping.py index 16f92d639746..e49f40e599d1 100644 --- a/nova/objects/instance_mapping.py +++ b/nova/objects/instance_mapping.py @@ -143,9 +143,7 @@ class InstanceMappingList(base.ObjectListBase, base.NovaObject): @db_api.api_context_manager.reader def _get_by_project_id_from_db(context, project_id): return (context.session.query(api_models.InstanceMapping) - .join(api_models.CellMapping) - .with_entities(api_models.InstanceMapping, - api_models.CellMapping) + .options(joinedload('cell_mapping')) .filter( api_models.InstanceMapping.project_id == project_id)).all()