openstack
/
neutron
Code Issues Proposed changes

Merge "ml2: fix update_device_up to send lm events with linux bridge" into stable/pike

This commit is contained in:
Zuul 2018-03-20 23:09:15 +00:00 committed by Gerrit Code Review
parent 40ac93b806 50988f3f36
commit 76e38a4daf
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/plugins/ml2/rpc.py
View File

@ -17,7 +17,6 @@ from neutron_lib.api.definitions import port_security as psec
from neutron_lib.api.definitions import portbindings
from neutron_lib.callbacks import resources
from neutron_lib import constants as n_const
from neutron_lib import exceptions
from neutron_lib.plugins import directory
from neutron_lib.plugins.ml2 import api
from oslo_log import log
@ -253,9 +252,10 @@ class RpcCallbacks(type_tunnel.TunnelRpcCallbackMixin):
# this might mean that a VM is in the process of live migration
# and vif was plugged on the destination compute node;
# need to notify nova explicitly
try:
port = plugin._get_port(rpc_context, port_id)
except exceptions.PortNotFound:
port = ml2_db.get_port(rpc_context, port_id)
# _device_to_port_id may have returned a truncated UUID if the
# agent did not provide a full one (e.g. Linux Bridge case).
if not port:
LOG.debug("Port %s not found, will not notify nova.", port_id)
return
else:

12
neutron/tests/unit/plugins/ml2/test_rpc.py
View File

@ -31,6 +31,7 @@ from sqlalchemy.orm import exc
from neutron.agent import rpc as agent_rpc
from neutron.common import topics
from neutron.db import provisioning_blocks
from neutron.plugins.ml2 import db as ml2_db
from neutron.plugins.ml2.drivers import type_tunnel
from neutron.plugins.ml2 import managers
from neutron.plugins.ml2 import rpc as plugin_rpc
@ -222,11 +223,12 @@ class RpcCallbacksTestCase(base.BaseTestCase):
return res
def test_update_device_up_with_device_not_bound_to_host(self):
self.assertIsNone(self._test_update_device_not_bound_to_host(
self.callbacks.update_device_up))
port = self.plugin._get_port.return_value
(self.plugin.nova_notifier.notify_port_active_direct.
assert_called_once_with(port))
with mock.patch.object(ml2_db, 'get_port') as ml2_db_get_port:
self.assertIsNone(self._test_update_device_not_bound_to_host(
self.callbacks.update_device_up))
port = ml2_db_get_port.return_value
(self.plugin.nova_notifier.notify_port_active_direct.
assert_called_once_with(port))
def test_update_device_down_with_device_not_bound_to_host(self):
self.assertEqual(