diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-21 03:21:07 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-21 03:21:07 +0000 |
| commit | 7d73a3582d5045dab273c7e8cfd396b900edc3b4 (patch) | |
| tree | 2654360ae24c8ea5cafa11e3be13005c2b77c151 /nova/db | |
| parent | de383023e4d5c30d3ad4474af104f6b659e1bd32 (diff) | |
| parent | 0d705117a0d0c04d845c5d146455cd11ba9af88c (diff) | |
| download | nova-7d73a3582d5045dab273c7e8cfd396b900edc3b4.tar.gz nova-7d73a3582d5045dab273c7e8cfd396b900edc3b4.tar.xz nova-7d73a3582d5045dab273c7e8cfd396b900edc3b4.zip | |
Tests pass after cleaning up allocation process
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 55036d1d1..f7787d1f0 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -385,6 +385,7 @@ def floating_ip_get_by_address(context, address, session=None): session = get_session() result = session.query(models.FloatingIp).\ + options(joinedload_all('fixed_ip.network')).\ filter_by(address=address).\ filter_by(deleted=can_read_deleted(context)).\ first() |