diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-14 19:36:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-14 19:36:47 +0000 |
| commit | f40357574245d2e3b8cb7995cb27adc8e9b99175 (patch) | |
| tree | ca902d46d15618380066f8b23b7691499bcff8d7 | |
| parent | edca430b52631fd4fac150923cc339fe1e2cd351 (diff) | |
| parent | f48f1bb72474e564f4f8b01da97730f612a868f9 (diff) | |
Merge "Make fixed_ip_disassociate_all_by_timeout work."
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 3544023eb..bf5847dc3 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1015,16 +1015,17 @@ def fixed_ip_disassociate_all_by_timeout(context, host, time): host_filter = or_(and_(models.Instance.host == host, models.Network.multi_host == True), models.Network.host == host) - fixed_ips = model_query(context, models.FixedIp.id, session=session, + fixed_ips = model_query(context, models.FixedIp, session=session, read_deleted="yes").\ filter(models.FixedIp.updated_at < time).\ filter(models.FixedIp.instance_id != None).\ filter(models.FixedIp.allocated == False).\ filter(host_filter).\ all() + fixed_ip_ids = [fip.id for fip in fixed_ips] result = model_query(context, models.FixedIp, session=session, read_deleted="yes").\ - filter(models.FixedIp.id.in_(fixed_ips)).\ + filter(models.FixedIp.id.in_(fixed_ip_ids)).\ update({'instance_id': None, 'leased': False, 'updated_at': utils.utcnow()}, |