diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-03 23:31:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-03 23:31:20 +0000 |
| commit | 06407be0da134db23cfd02fe320caa5c444315c2 (patch) | |
| tree | 2ac519388af423b4881aaafe9331a0190b3284ac /nova/tests | |
| parent | d4aab5b28209c15ba9ff3f09ba93ce262c8cd99c (diff) | |
| parent | c96e75d6804d016da7c6356bf593eb86dcb2f257 (diff) | |
Merge "Grab the vif directly on release instead of lookup"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/network/test_manager.py | 5 |
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, |