diff options
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_db_api.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 3a4e8ea1b..c555c73c8 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1070,7 +1070,7 @@ def fixed_ip_get_all(context, session=None): @require_context def fixed_ip_get_by_address(context, address, session=None): result = model_query(context, models.FixedIp, session=session, - read_deleted="yes").\ + read_deleted=context.read_deleted).\ filter_by(address=address).\ first() if not result: diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index c1002d98a..1abd44a90 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -151,6 +151,8 @@ class DbApiTestCase(test.TestCase): db.network_delete_safe, ctxt, network['id']) db.fixed_ip_update(ctxt, address2, {'allocated': False}) network = db.network_delete_safe(ctxt, network['id']) + self.assertRaises(exception.FixedIpNotFoundForAddress, + db.fixed_ip_get_by_address, ctxt, address1) ctxt = ctxt.elevated(read_deleted='yes') fixed_ip = db.fixed_ip_get_by_address(ctxt, address1) self.assertTrue(fixed_ip['deleted']) |