openstack
/
nova
Code Issues Proposed changes

Merge "fixed_ip_get_by_address read_deleted from context" into stable/essex

This commit is contained in:
Jenkins 2012-10-11 17:28:04 +00:00 committed by Gerrit Code Review
parent d1d5d6d19d 20f98c5785
commit 17a6cd91ef
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -80,3 +80,4 @@
<nsokolov@griddynamics.com> <nsokolov@griddynamics.net> <nsokolov@griddynamics.com> <nsokolov@griddynamics.net>
<troy.toman@rackspace.com> <ttcl@mac.com> <troy.toman@rackspace.com> <ttcl@mac.com>
<zulcss@ubuntu.com> <chuck.short@canonical.com> <zulcss@ubuntu.com> <chuck.short@canonical.com>
<jhtran@att.com> <jtran@attinteractive.com>

2
Authors
View File

@ -101,7 +101,7 @@ John Dewey <john@dewey.ws>
John Garbutt <john.garbutt@citrix.com> John Garbutt <john.garbutt@citrix.com>
John Griffith <john.griffith@solidfire.com> John Griffith <john.griffith@solidfire.com>
John Kennedy <john.m.kennedy@intel.com> John Kennedy <john.m.kennedy@intel.com>
John Tran <jtran@attinteractive.com> John Tran <jhtran@att.com>
Jonathan Bryce <jbryce@jbryce.com> Jonathan Bryce <jbryce@jbryce.com>
Jordan Rinke <jordan@openstack.org> Jordan Rinke <jordan@openstack.org>
Joseph Suh <jsuh@isi.edu> Joseph Suh <jsuh@isi.edu>

2
nova/db/sqlalchemy/api.py
View File

@ -1047,7 +1047,7 @@ def fixed_ip_get_all(context, session=None):
@require_context @require_context
def fixed_ip_get_by_address(context, address, session=None): def fixed_ip_get_by_address(context, address, session=None):
result = model_query(context, models.FixedIp, session=session, result = model_query(context, models.FixedIp, session=session,
read_deleted="yes").\ read_deleted=context.read_deleted).\
filter_by(address=address).\ filter_by(address=address).\
first() first()
if not result: if not result:

2
nova/tests/test_db_api.py
View File

@ -151,6 +151,8 @@ class DbApiTestCase(test.TestCase):
db.network_delete_safe, ctxt, network['id']) db.network_delete_safe, ctxt, network['id'])
db.fixed_ip_update(ctxt, address2, {'allocated': False}) db.fixed_ip_update(ctxt, address2, {'allocated': False})
network = db.network_delete_safe(ctxt, network['id']) 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') ctxt = ctxt.elevated(read_deleted='yes')
fixed_ip = db.fixed_ip_get_by_address(ctxt, address1) fixed_ip = db.fixed_ip_get_by_address(ctxt, address1)
self.assertTrue(fixed_ip['deleted']) self.assertTrue(fixed_ip['deleted'])