From c1e54e1968faa23dfa26796fdb8f3f8d9ba79367 Mon Sep 17 00:00:00 2001 From: John Tran Date: Tue, 15 May 2012 10:00:36 -0700 Subject: fixed_ip_get_by_address read_deleted from context Fixes bug 996482. by default fixed_ip_get_by_address always sets read_deleted='yes'. Changed it to accept read_deleted value from context. updated .mailmap to rewrite my old email to new email Change-Id: If94251972df7bbcfdeebc226613edac0a3f41186 --- nova/tests/test_db_api.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nova/tests') 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']) -- cgit