From c8f7e66cc3253f86b88cd97b794f4654fab1bcb9 Mon Sep 17 00:00:00 2001 From: Zhi Yan Liu Date: Tue, 12 Mar 2013 12:37:30 +0800 Subject: Skip deleted fixed ip address for os-fixed-ips extension Return the correct fixed ip address info when the address record(s) marked 'deleted' in db. Fixes bug 1152958 Change-Id: I58ba47427753a81cd43eb618cff199c45f83322c Signed-off-by: Zhi Yan Liu --- nova/db/sqlalchemy/api.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'nova/db') diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index c98cb716e..7858ce39c 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1169,14 +1169,15 @@ def fixed_ip_get_by_address_detailed(context, address, session=None): if not session: session = get_session() - result = session.query(models.FixedIp, models.Network, models.Instance).\ - filter_by(address=address).\ - outerjoin((models.Network, - models.Network.id == - models.FixedIp.network_id)).\ - outerjoin((models.Instance, - models.Instance.uuid == - models.FixedIp.instance_uuid)).\ + result = model_query(context, models.FixedIp, models.Network, + models.Instance, session=session).\ + filter_by(address=address).\ + outerjoin((models.Network, + models.Network.id == + models.FixedIp.network_id)).\ + outerjoin((models.Instance, + models.Instance.uuid == + models.FixedIp.instance_uuid)).\ first() if not result: -- cgit