From 2f76cd502fcc434b33af8963ac01c2ff6b8c723e Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 16 Dec 2011 13:08:56 -0800
Subject: [PATCH] Adds missing joinedload for vif loading.

 * fixes bug 905398

Change-Id: I76ffea1437459942f5156d199592931afed4ae1b
---
 nova/db/sqlalchemy/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 373e79f97ed..c8ac5ca44e4 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