openstack
/
nova
Code Issues Proposed changes

Merge "Commit quota when deallocate floating ip"

This commit is contained in:
Jenkins 2014-08-05 05:36:03 +00:00 committed by Gerrit Code Review
parent 4e332e468b 77a7d14542
commit 7d85ac7892
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/objects/floating_ip.py
View File

@ -106,7 +106,7 @@ class FloatingIP(obj_base.NovaPersistentObject, obj_base.NovaObject):
@obj_base.remotable_classmethod
def deallocate(cls, context, address):
db.floating_ip_deallocate(context, address)
return db.floating_ip_deallocate(context, address)
@obj_base.remotable_classmethod
def destroy(cls, context, address):

10
nova/tests/network/test_manager.py
View File

@ -1103,12 +1103,14 @@ class VlanNetworkTestCase(test.TestCase):
self.network.allocate_floating_ip(ctxt, ctxt.project_id)
def test_deallocate_floating_ip(self):
@mock.patch('nova.quota.QUOTAS.reserve')
@mock.patch('nova.quota.QUOTAS.commit')
def test_deallocate_floating_ip(self, mock_commit, mock_reserve):
ctxt = context.RequestContext('testuser', 'testproject',
is_admin=False)
def fake1(*args, **kwargs):
pass
return dict(test_floating_ip.fake_floating_ip)
def fake2(*args, **kwargs):
return dict(test_floating_ip.fake_floating_ip,
@ -1129,10 +1131,14 @@ class VlanNetworkTestCase(test.TestCase):
ctxt,
mox.IgnoreArg())
mock_reserve.return_value = 'reserve'
# this time should not raise
self.stubs.Set(self.network.db, 'floating_ip_get_by_address', fake3)
self.network.deallocate_floating_ip(ctxt, ctxt.project_id)
mock_commit.assert_called_once_with(ctxt, 'reserve',
project_id='testproject')
@mock.patch('nova.db.fixed_ip_get')
def test_associate_floating_ip(self, fixed_get):
ctxt = context.RequestContext('testuser', 'testproject',