d31cbe9364
The following properties are added to the PortContext object passed to ML2 mechanism drivers for port operations: * bound_driver - name of current bound driver * original_bound_driver - name previously bound driver in an update * original_bound_segment - network segment used in previous binding Some issues with the existing ML2 port binding unit tests were also fixed. The remainder of the fix for bug 1276395, making these binding details available to mechanism drivers when a port is deleted, will be addressed as part of the fix for bug 1276391. Partial-Bug: #1276395 Change-Id: I9ecff4a4e044920ed2dde709c89aeb9bc773220d
126 lines
5.3 KiB
Python
126 lines
5.3 KiB
Python
# Copyright (c) 2013 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
|
|
from neutron import context
|
|
from neutron.extensions import portbindings
|
|
from neutron import manager
|
|
from neutron.plugins.ml2 import config as config
|
|
from neutron.tests.unit import test_db_plugin as test_plugin
|
|
|
|
|
|
PLUGIN_NAME = 'neutron.plugins.ml2.plugin.Ml2Plugin'
|
|
|
|
|
|
class PortBindingTestCase(test_plugin.NeutronDbPluginV2TestCase):
|
|
|
|
_plugin_name = PLUGIN_NAME
|
|
|
|
def setUp(self):
|
|
# Enable the test mechanism driver to ensure that
|
|
# we can successfully call through to all mechanism
|
|
# driver apis.
|
|
config.cfg.CONF.set_override('mechanism_drivers',
|
|
['logger', 'test'],
|
|
'ml2')
|
|
self.addCleanup(config.cfg.CONF.reset)
|
|
super(PortBindingTestCase, self).setUp(PLUGIN_NAME)
|
|
self.port_create_status = 'DOWN'
|
|
self.plugin = manager.NeutronManager.get_plugin()
|
|
|
|
def _check_response(self, port, vif_type, has_port_filter, bound):
|
|
self.assertEqual(port[portbindings.VIF_TYPE], vif_type)
|
|
vif_details = port[portbindings.VIF_DETAILS]
|
|
if bound:
|
|
# TODO(rkukura): Replace with new VIF security details
|
|
self.assertEqual(vif_details[portbindings.CAP_PORT_FILTER],
|
|
has_port_filter)
|
|
|
|
def _test_port_binding(self, host, vif_type, has_port_filter, bound):
|
|
host_arg = {portbindings.HOST_ID: host}
|
|
with self.port(name='name', arg_list=(portbindings.HOST_ID,),
|
|
**host_arg) as port:
|
|
self._check_response(port['port'], vif_type, has_port_filter,
|
|
bound)
|
|
port_id = port['port']['id']
|
|
details = self.plugin.callbacks.get_device_details(
|
|
None, agent_id="theAgentId", device=port_id)
|
|
if bound:
|
|
self.assertEqual(details['network_type'], 'local')
|
|
else:
|
|
self.assertNotIn('network_type', details)
|
|
|
|
def test_unbound(self):
|
|
self._test_port_binding("",
|
|
portbindings.VIF_TYPE_UNBOUND,
|
|
False, False)
|
|
|
|
def test_binding_failed(self):
|
|
self._test_port_binding("host-fail",
|
|
portbindings.VIF_TYPE_BINDING_FAILED,
|
|
False, False)
|
|
|
|
def test_binding_no_filter(self):
|
|
self._test_port_binding("host-ovs-no_filter",
|
|
portbindings.VIF_TYPE_OVS,
|
|
False, True)
|
|
|
|
def test_binding_filter(self):
|
|
self._test_port_binding("host-bridge-filter",
|
|
portbindings.VIF_TYPE_BRIDGE,
|
|
True, True)
|
|
|
|
def _test_update_port_binding(self, host, new_host=None):
|
|
with mock.patch.object(self.plugin,
|
|
'_notify_port_updated') as notify_mock:
|
|
host_arg = {portbindings.HOST_ID: host}
|
|
update_body = {'name': 'test_update'}
|
|
if new_host is not None:
|
|
update_body[portbindings.HOST_ID] = new_host
|
|
with self.port(name='name', arg_list=(portbindings.HOST_ID,),
|
|
**host_arg) as port:
|
|
neutron_context = context.get_admin_context()
|
|
updated_port = self._update('ports', port['port']['id'],
|
|
{'port': update_body},
|
|
neutron_context=neutron_context)
|
|
port_data = updated_port['port']
|
|
if new_host is not None:
|
|
self.assertEqual(port_data[portbindings.HOST_ID],
|
|
new_host)
|
|
else:
|
|
self.assertEqual(port_data[portbindings.HOST_ID], host)
|
|
if new_host is not None and new_host != host:
|
|
notify_mock.assert_called_once_with(mock.ANY)
|
|
else:
|
|
self.assertFalse(notify_mock.called)
|
|
|
|
def test_update_with_new_host_binding_notifies_agent(self):
|
|
self._test_update_port_binding('host-ovs-no_filter',
|
|
'host-bridge-filter')
|
|
|
|
def test_update_with_same_host_binding_does_not_notify(self):
|
|
self._test_update_port_binding('host-ovs-no_filter',
|
|
'host-ovs-no_filter')
|
|
|
|
def test_update_without_binding_does_not_notify(self):
|
|
self._test_update_port_binding('host-ovs-no_filter')
|
|
|
|
def testt_update_from_empty_to_host_binding_notifies_agent(self):
|
|
self._test_update_port_binding('', 'host-ovs-no_filter')
|
|
|
|
def test_update_from_host_to_empty_binding_notifies_agent(self):
|
|
self._test_update_port_binding('host-ovs-no_filter', '')
|