diff --git a/.mailmap b/.mailmap
index 84e31bf536d3..66ae701dd5f0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -79,3 +79,4 @@
 <nsokolov@griddynamics.com> <nsokolov@griddynamics.net>
 <div class="naked_tr"> <ttcl@mac.com>
 <zulcss@ubuntu.com> <chuck.short@canonical.com>
+<jhtran@att.com> <jtran@attinteractive.com>
diff --git a/Authors b/Authors
index 5c5df3d61e66..88285d971157 100644
--- a/Authors
+++ b/Authors
@@ -99,7 +99,7 @@ John Dewey <john@dewey.ws>
 John Garbutt <john.garbutt@citrix.com>
 John Griffith <john.griffith@solidfire.com>
 John Kennedy <john.m.kennedy@intel.com>
-John Tran <jtran@attinteractive.com>
+John Tran <jhtran@att.com>
 Jonathan Bryce <jbryce@jbryce.com>
 Jordan Rinke <jordan@openstack.org>
 Joseph Suh <jsuh@isi.edu>
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 3a4e8ea1b7bf..c555c73c83b5 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 c1002d98ad7f..1abd44a90d99 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'])
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/nova/commit/c1e54e1968faa23dfa26796fdb8f3f8d9ba79367.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/nova/commit/c1e54e1968faa23dfa26796fdb8f3f8d9ba79367.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>