diff options
| author | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2013-02-01 10:07:06 -0500 |
|---|---|---|
| committer | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2013-02-01 10:07:06 -0500 |
| commit | df4e4b6a49ebcb890f4ea0d1b1e91618586e67a5 (patch) | |
| tree | 26076c437c9131d1a74da920876ecc498dcc5657 | |
| parent | c421d775ee3052d1af4c08b8ff81f6877ca8b1a8 (diff) | |
| download | nova-df4e4b6a49ebcb890f4ea0d1b1e91618586e67a5.tar.gz nova-df4e4b6a49ebcb890f4ea0d1b1e91618586e67a5.tar.xz nova-df4e4b6a49ebcb890f4ea0d1b1e91618586e67a5.zip | |
Postgres does not like empty strings for type inet
Check for empty string and explicitly set address to None
Fixes LP# 1112536
Change-Id: Ib6f1ca9ab4dd11a53e2ab8057664136166b4c616
| -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() |