diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-13 16:49:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-13 16:49:42 +0000 |
| commit | 697843b2af4c47df299d47d1fd765eec79b160db (patch) | |
| tree | 43cee02d213a056893736c3f57678ee4dec616b7 /nova/db | |
| parent | 2326188d0e907c1e5854a0df00b5df15237e0dac (diff) | |
| parent | c8f7e66cc3253f86b88cd97b794f4654fab1bcb9 (diff) | |
Merge "Skip deleted fixed ip address for os-fixed-ips extension"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 88c2d9915..81a975983 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: |