summaryrefslogtreecommitdiffstats
path: root/nova/db
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-12-16 13:08:56 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-12-16 13:08:56 -0800
commit2f76cd502fcc434b33af8963ac01c2ff6b8c723e (patch)
treedbafc112a7a52095efa68c0ef8277ba818e67691 /nova/db
parent9b9b6d3076a13f762e0152b8399875e7fbad30db (diff)
Adds missing joinedload for vif loading.
* fixes bug 905398 Change-Id: I76ffea1437459942f5156d199592931afed4ae1b
Diffstat (limited to 'nova/db')
-rw-r--r--nova/db/sqlalchemy/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 373e79f97..c8ac5ca44 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -947,7 +947,7 @@ def virtual_interface_update(context, vif_id, values):
def _virtual_interface_query(context, session=None):
return model_query(context, models.VirtualInterface, session=session,
read_deleted="yes").\
- options(joinedload('fixed_ips'))
+ options(joinedload_all('fixed_ips.floating_ips'))
@require_context