openstack/nova
Code Issues Proposed changes

Merge "Handle NotImplementedError in _process_instance_vif_deleted_event"

Browse Source
This commit is contained in:
Jenkins
2017-02-03 21:13:10 +00:00
committed by Gerrit Code Review
parent 245c54796f 00c0830c3e
commit 3b8da5fa44
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/manager.py
View File

@@ -6791,6 +6791,10 @@ class ComputeManager(manager.Manager):
nw_info=network_info)
try:
self.driver.detach_interface(context, instance, vif)
except NotImplementedError:
# Not all virt drivers support attach/detach of interfaces
# yet (like Ironic), so just ignore this.
pass
except exception.NovaException as ex:
LOG.warning(_LW("Detach interface failed, "
"port_id=%(port_id)s, reason: %(msg)s"),

25
nova/tests/unit/compute/test_compute_mgr.py
View File

@@ -2165,6 +2165,31 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
inst_obj, vif2)
do_test()
def test_process_instance_vif_deleted_event_not_implemented_error(self):
"""Tests the case where driver.detach_interface raises
NotImplementedError.
"""
vif = fake_network_cache_model.new_vif()
nw_info = network_model.NetworkInfo([vif])
info_cache = objects.InstanceInfoCache(network_info=nw_info,
instance_uuid=uuids.instance)
inst_obj = objects.Instance(id=3, uuid=uuids.instance,
info_cache=info_cache)
@mock.patch.object(manager.base_net_api,
'update_instance_cache_with_nw_info')
@mock.patch.object(self.compute.driver, 'detach_interface',
side_effect=NotImplementedError)
def do_test(detach_interface, update_instance_cache_with_nw_info):
self.compute._process_instance_vif_deleted_event(
self.context, inst_obj, vif['id'])
update_instance_cache_with_nw_info.assert_called_once_with(
self.compute.network_api, self.context, inst_obj, nw_info=[])
detach_interface.assert_called_once_with(
self.context, inst_obj, vif)
do_test()
def test_external_instance_event(self):
instances = [
objects.Instance(id=1, uuid=uuids.instance_1),