x/python-ganttclient
Code Issues Proposed changes

Merge "fixed_ip_get_by_address read_deleted from context"

Browse Source
This commit is contained in:
Jenkins
2012-05-18 22:06:15 +00:00
committed by Gerrit Code Review
parent 0ebd183ab3 4f35f89f2c
commit d55ef2ad4f
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@@ -79,3 +79,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

@@ -99,7 +99,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/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'])