diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-11 23:32:03 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-11 23:32:03 -0700 |
| commit | e45a5dd2cbcfe5d43cc59c6a20e3d065d43ee161 (patch) | |
| tree | 24a934899deb7018bd479257f84ac2fa03423fdc /nova/db | |
| parent | 53bba81d1e9774eefadd4f0f2b25638838a7ad07 (diff) | |
| download | nova-e45a5dd2cbcfe5d43cc59c6a20e3d065d43ee161.tar.gz nova-e45a5dd2cbcfe5d43cc59c6a20e3d065d43ee161.tar.xz nova-e45a5dd2cbcfe5d43cc59c6a20e3d065d43ee161.zip | |
speed up generation of dhcp_hosts and don't run into None errors if instance is deleted
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 cc496e558..4cc086006 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -437,6 +437,7 @@ def network_get(_context, network_id): def network_get_associated_fixed_ips(_context, network_id): session = get_session() return session.query(models.FixedIp + ).options(joinedload_all('instance') ).filter_by(network_id=network_id ).filter(models.FixedIp.instance_id != None ).filter_by(deleted=False |