diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-02 12:40:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-02 12:40:40 +0000 |
| commit | 55b59008ae0a8618c87532c3436a036a98706d76 (patch) | |
| tree | 4f04a9864dd2b028c38f478ce12b234c50a22027 | |
| parent | a1072dd7da33243326c72256a7ee72f8a815ffd1 (diff) | |
| parent | df4e4b6a49ebcb890f4ea0d1b1e91618586e67a5 (diff) | |
| download | nova-55b59008ae0a8618c87532c3436a036a98706d76.tar.gz nova-55b59008ae0a8618c87532c3436a036a98706d76.tar.xz nova-55b59008ae0a8618c87532c3436a036a98706d76.zip | |
Merge "Postgres does not like empty strings for type inet"
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index ad7e4f21f..7ba4c73f5 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -890,6 +890,11 @@ def floating_ip_get_by_address(context, address): @require_context def _floating_ip_get_by_address(context, address, session=None): + + # if address string is empty explicitly set it to None + if not address: + address = None + result = model_query(context, models.FloatingIp, session=session).\ filter_by(address=address).\ first() |