From c96e75d6804d016da7c6356bf593eb86dcb2f257 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Tue, 3 Apr 2012 10:07:05 -0700 Subject: Grab the vif directly on release instead of lookup * adds extra error handling and logging * safer fix for bug 968457 Change-Id: I6d8c27c642e70dc701548550c0d94a8e0e64ce99 --- nova/tests/network/test_manager.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'nova/tests') 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, -- cgit