Merge lp:~rackspace-titan/nova/fixed_ip_disassociate_timeout_pgsql into lp:~hudson-openstack/nova/trunk

Proposed by Dan Prince
Status: Merged
Approved by: Mark Washenberger
Approved revision: 1231
Merged at revision: 1241
Proposed branch: lp:~rackspace-titan/nova/fixed_ip_disassociate_timeout_pgsql
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 15 lines (+2/-2)
1 file modified
nova/db/sqlalchemy/api.py (+2/-2)
To merge this branch: bzr merge lp:~rackspace-titan/nova/fixed_ip_disassociate_timeout_pgsql
Reviewer Review Type Date Requested Status
Mark Washenberger (community) Approve
Devin Carlen (community) Approve
Review via email: mp+66405@code.launchpad.net

Description of the change

Update the fixed_ip_disassociate_all_by_timeout in nova.db.api so that it supports Postgres.
Fixes casting errors on postgres with this function.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve
Revision history for this message
Mark Washenberger (markwash) wrote :

Postgres--such a stickler! :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py 2011-06-28 20:53:45 +0000
+++ nova/db/sqlalchemy/api.py 2011-06-30 02:11:06 +0000
@@ -715,9 +715,9 @@
715 filter(models.FixedIp.network_id.in_(inner_q)).\715 filter(models.FixedIp.network_id.in_(inner_q)).\
716 filter(models.FixedIp.updated_at < time).\716 filter(models.FixedIp.updated_at < time).\
717 filter(models.FixedIp.instance_id != None).\717 filter(models.FixedIp.instance_id != None).\
718 filter_by(allocated=0).\718 filter_by(allocated=False).\
719 update({'instance_id': None,719 update({'instance_id': None,
720 'leased': 0,720 'leased': False,
721 'updated_at': utils.utcnow()},721 'updated_at': utils.utcnow()},
722 synchronize_session='fetch')722 synchronize_session='fetch')
723 return result723 return result