openstack
/
nova
Code Issues Proposed changes

Merge "hyper-v: Logs tips on PortBindingFailed" into stable/queens

This commit is contained in:
Zuul 2018-03-08 15:17:08 +00:00 committed by Gerrit Code Review
parent 9d8de62a07 e2d08409f1
commit 00bbe42355
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nova/tests/unit/virt/hyperv/test_vmops.py
View File

@ -503,6 +503,18 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
deadline=CONF.vif_plugging_timeout, deadline=CONF.vif_plugging_timeout,
error_callback=self._vmops._neutron_failed_callback) error_callback=self._vmops._neutron_failed_callback)
@mock.patch.object(vmops.VMOps, '_get_neutron_events')
def test_wait_vif_plug_events_port_binding_failed(self, mock_get_events):
mock_get_events.side_effect = exception.PortBindingFailed(
port_id='fake_id')
def _context_user():
with self._vmops.wait_vif_plug_events(mock.sentinel.instance,
mock.sentinel.network_info):
pass
self.assertRaises(exception.PortBindingFailed, _context_user)
def test_neutron_failed_callback(self): def test_neutron_failed_callback(self):
self.flags(vif_plugging_is_fatal=True) self.flags(vif_plugging_is_fatal=True)
self.assertRaises(exception.VirtualInterfaceCreateException, self.assertRaises(exception.VirtualInterfaceCreateException,

15
nova/virt/hyperv/vmops.py
View File

@ -306,9 +306,11 @@ class VMOps(object):
@contextlib.contextmanager @contextlib.contextmanager
def wait_vif_plug_events(self, instance, network_info): def wait_vif_plug_events(self, instance, network_info):
timeout = CONF.vif_plugging_timeout timeout = CONF.vif_plugging_timeout
events = self._get_neutron_events(network_info)
try: try:
# NOTE(claudiub): async calls to bind the neutron ports will be
# done when network_info is being accessed.
events = self._get_neutron_events(network_info)
with self._virtapi.wait_for_instance_event( with self._virtapi.wait_for_instance_event(
instance, events, deadline=timeout, instance, events, deadline=timeout,
error_callback=self._neutron_failed_callback): error_callback=self._neutron_failed_callback):
@ -319,6 +321,17 @@ class VMOps(object):
'instance.', instance=instance) 'instance.', instance=instance)
if CONF.vif_plugging_is_fatal: if CONF.vif_plugging_is_fatal:
raise exception.VirtualInterfaceCreateException() raise exception.VirtualInterfaceCreateException()
except exception.PortBindingFailed:
LOG.warning(
"Neutron failed to bind a port to this host. Make sure that "
"an L2 agent is alive and registered from this node (neutron "
"Open vSwitch agent or Hyper-V agent), or make sure that "
"neutron is configured with a mechanism driver that is able "
"to bind ports to this host (OVN). If you are using neutron "
"Hyper-V agent, make sure that networking-hyperv is installed "
"on the neutron controller, and that the neutron-server was "
"configured to use the 'hyperv' mechanism_driver.")
raise
def _neutron_failed_callback(self, event_name, instance): def _neutron_failed_callback(self, event_name, instance):
LOG.error('Neutron Reported failure on event %s', LOG.error('Neutron Reported failure on event %s',