openstack
/
neutron
Code Issues Proposed changes

ml2: fix update_device_up to send lm events with linux bridge 

In case of a live migration and with linux bridge the events are not
sent to Nova, because the port UUID returned by _device_to_port_id may
be a truncated UUID and the current plugin._get_port() can't find it.

Conflicts:
        neutron/tests/unit/plugins/ml2/test_rpc.py

NOTE(lyarwood): Test conflict introducing an additional mock for ml2_db,
required prior to Pike and Ia15c63f94d2c67791da3b65546e59f6929c8c685.

Related-Bug: #1414559
Change-Id: Icb039ae2d465e3822ab07ae4f9bc405c1362afba
Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com>
(cherry picked from commit 38b3d4e16a)
(cherry picked from commit 50988f3f36)
This commit is contained in:
Sahid Orentino Ferdjaoui 2017-09-21 15:42:54 +02:00 committed by Lee Yarwood
parent 93330aca08
commit d9c6610cb6
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,6 @@
# under the License.
from neutron_lib import constants as n_const
from neutron_lib import exceptions
from neutron_lib.plugins import directory
from oslo_log import log
import oslo_messaging
@ -238,9 +237,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:

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

@ -30,6 +30,7 @@ from neutron.agent import rpc as agent_rpc
from neutron.callbacks import resources
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
@ -62,7 +63,8 @@ class RpcCallbacksTestCase(base.BaseTestCase):
mock.patch.object(self.callbacks, 'notify_ha_port_status'):
with mock.patch('neutron.db.provisioning_blocks.'
'provisioning_complete') as pc:
self.callbacks.update_device_up(mock.Mock(), **kwargs)
with mock.patch.object(ml2_db, 'get_port'):
self.callbacks.update_device_up(mock.Mock(), **kwargs)
return pc
def test_update_device_up_notify(self):
@ -221,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(