summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2012-04-03 10:07:05 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2012-04-03 10:07:05 -0700
commitc96e75d6804d016da7c6356bf593eb86dcb2f257 (patch)
treeb348837b8805b1c977a6a96f924832b18427df38 /nova/tests
parent32f07e62e9358ab8560ed70f17326009de2b04ae (diff)
Grab the vif directly on release instead of lookup
* adds extra error handling and logging * safer fix for bug 968457 Change-Id: I6d8c27c642e70dc701548550c0d94a8e0e64ce99
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/network/test_manager.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py
index ef1e6b70c..7ef5a9d33 100644
--- a/nova/tests/network/test_manager.py
+++ b/nova/tests/network/test_manager.py
@@ -883,11 +883,10 @@ class VlanNetworkTestCase(test.TestCase):
self.stubs.Set(db, 'network_get', network_get)
- def vif_get(_context, _instance_id, _network_id):
+ def vif_get(_context, _vif_id):
return None
- self.stubs.Set(db, 'virtual_interface_get_by_instance_and_network',
- vif_get)
+ self.stubs.Set(db, 'virtual_interface_get', vif_get)
context1 = context.RequestContext('user', 'project1')
instance = db.instance_create(context1,